- rel 1 for Ac

[packages/cyrus-sasl.git] / cyrus-sasl.spec

diff --git a/cyrus-sasl.spec b/cyrus-sasl.spec
index 190b0ea90e2bb29907f2934321f460ee8b59c6d8..c225c045a0a4fb9ffed2fe67d025239d34e4d5a9 100644 (file)
--- a/cyrus-sasl.spec
+++ b/cyrus-sasl.spec
@@ -18,20 +18,18 @@ Summary(pt_BR):     Implementa
 Summary(ru):   âÉÂÌÉÏÔÅËÁ Cyrus SASL
 Summary(uk):   â¦Â̦ÏÔÅËÁ Cyrus SASL
 Name:          cyrus-sasl
-Version:       2.1.17
-Release:       0.3
+Version:       2.1.18
+Release:       1
 License:       distributable
 Group:         Libraries
 Source0:       ftp://ftp.andrew.cmu.edu/pub/cyrus/%{name}-%{version}.tar.gz
-# Source0-md5: 4add6be2f194dc51aafc64193a1dd77b
+# Source0-md5: 1eafae95f0289c10f187d8b2bc4032cf
 Source1:       saslauthd.init
 Source2:       saslauthd.sysconfig
 Source3:       %{name}.pam
 Patch0:                %{name}-configdir.patch
 Patch1:                %{name}-nolibs.patch
-Patch2:                %{name}-do_dlopen.patch
-Patch3:                %{name}-ldb4.patch
-Patch4:                %{name}-lt.patch
+Patch2:                %{name}-lt.patch
 URL:           http://asg.web.cmu.edu/sasl/
 BuildRequires: autoconf >= 2.54
 BuildRequires: automake
@@ -374,8 +372,6 @@ Wtyczka PostgreSQL do Cyrus SASL.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
-%patch4
 
 cd doc
 echo "cyrus-sasl complies with the following RFCs:" > rfc-compliance
@@ -384,7 +380,7 @@ rm -f rfc*.txt
 
 %build
 # acinclude.m4 contains only old libtool.m4
-rm -f acinclude.m4
+rm -f acinclude.m4 libtool config/libtool.m4
 %{__libtoolize}
 %{__aclocal} -I cmulocal -I config
 %{__autoheader}
@@ -392,6 +388,8 @@ rm -f acinclude.m4
 %{__autoconf}
 
 cd saslauthd
+       rm -f acinclude.m4
+       %{__libtoolize}
        %{__aclocal} -I ../cmulocal -I ../config -I config
        %{__autoheader}
        %{__automake}