diff --git a/libassuan-0.9.3-m4-2.patch b/libassuan-0.9.3-m4-2.patch new file mode 100644 index 0000000..7b838ad --- /dev/null +++ b/libassuan-0.9.3-m4-2.patch @@ -0,0 +1,20 @@ +--- src/libassuan.m4~ 2006-10-14 23:36:40.000000000 +0300 ++++ src/libassuan.m4 2006-10-14 23:38:07.000000000 +0300 +@@ -120,7 +120,7 @@ + + dnl AM_PATH_LIBASSUAN_PTH([MINIMUM-VERSION, + dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) +-dnl Test for libassuan and define LIBASSUAN_PTH_CFLAGSand LIBASSUAN_PTH_LIBS ++dnl Test for libassuan and define LIBASSUAN_PTH_CFLAGS and LIBASSUAN_PTH_LIBS + dnl + AC_DEFUN([AM_PATH_LIBASSUAN_PTH], + [ _AM_PATH_LIBASSUAN_COMMON($1,pth) +@@ -144,7 +144,7 @@ + dnl and LIBASSUAN_PTHREAD_LIBS + dnl + AC_DEFUN([AM_PATH_LIBASSUAN_PTHREAD], +-[ _AM_PATH_LIBASSUAN_COMMON($1,pth) ++[ _AM_PATH_LIBASSUAN_COMMON($1,pthread) + if test $ok = yes; then + LIBASSUAN_PTHREAD_CFLAGS=`$LIBASSUAN_CONFIG $libassuan_config_args --thread=pthread --cflags` + LIBASSUAN_PTHREAD_LIBS=`$LIBASSUAN_CONFIG $libassuan_config_args --thread=pthread --libs` diff --git a/libassuan.spec b/libassuan.spec index c688bb4..688a863 100644 --- a/libassuan.spec +++ b/libassuan.spec @@ -2,7 +2,7 @@ Name: libassuan Summary: GnuPG IPC library Version: 0.9.3 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL Source0: ftp://ftp.gnupg.org/gcrypt/alpha/libassuan/libassuan-%{version}.tar.bz2 @@ -12,6 +12,7 @@ Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch1: libassuan-0.9.3-m4.patch +Patch2: libassuan-0.9.3-m4-2.patch BuildRequires: pth-devel @@ -37,6 +38,7 @@ This package contains files needed to develop applications using %{name}. %setup -q %patch1 -p1 -b .m4patch +%patch2 -p0 -b .m4patch-2 %build @@ -56,6 +58,7 @@ make install DESTDIR=$RPM_BUILD_ROOT ## Unpackaged files rm -f $RPM_BUILD_ROOT%{_infodir}/dir + %check || : make check @@ -84,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Oct 18 2006 Rex Dieter - 0.9.3-2 +- another libassuan.m4 patch + * Tue Oct 10 2006 Rex Dieter - 0.9.3-1 - 0.9.3 - BR: pth-devel, -devel: Requires: pth-devel