- rel 1 for Ac

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

diff --git a/cyrus-sasl.spec b/cyrus-sasl.spec
index 7eb6ef2c77dfff2e1f6454698e9ea481da574672..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
@@ -85,7 +83,7 @@ Summary(pt_BR):       Exemplos e arquivos para desenvolvimento com SASL
 Summary(ru):   æÁÊÌÙ ÄÌÑ ÐÒÏÇÒÁÍÍÉÒÏ×ÁÎÉÑ Ó ÂÉÂÌÉÏÔÅËÏÊ Cyrus SASL
 Summary(ru):   æÁÊÌÉ ÄÌÑ ÐÒÏÇÒÁÍÕ×ÁÎÎÑ Ú Â¦Â̦ÏÔÅËÏÀ Cyrus SASL
 Group:         Development/Libraries
-Requires:      %{name} = %{version}
+Requires:      %{name} = %{version}-%{release}
 
 %description devel
 This includes the header files and documentation needed to develop
@@ -112,7 +110,7 @@ Summary(pl):        Statyczne biblioteki cyrus-sasl
 Summary(ru):   óÔÁÔÉÞÅÓËÉÅ ÂÉÂÌÉÏÔÅËÉ Cyrus SASL
 Summary(uk):   óÔÁÔÉÞΦ ¦Â̦ÏÔÅËÉ Cyrus SASL
 Group:         Development/Libraries
-Requires:      %{name}-devel = %{version}
+Requires:      %{name}-devel = %{version}-%{release}
 
 %description static
 Static cyrus-sasl libraries.
@@ -133,7 +131,7 @@ Summary:    Cram-MD5 Cyrus SASL plugin
 Summary(pl):   Wtyczka Cram-MD5 do Cyrus SASL
 Summary(pt_BR):        Mecanismo SASL CRAM-MD5
 Group:         Libraries
-Requires:      %{name} = %{version}
+Requires:      %{name} = %{version}-%{release}
 
 %description cram-md5
 This plugin implements the SASL CRAM-MD5 mechanism. CRAM-MD5 is the
@@ -158,7 +156,7 @@ Summary:    Digest-MD5 Cyrus SASL plugin
 Summary(pl):   Wtyczka Digest-MD5 do Cyrus SASL
 Summary(pt_BR):        Mecanismo SASL DIGEST-MD5
 Group:         Libraries
-Requires:      %{name} = %{version}
+Requires:      %{name} = %{version}-%{release}
 
 %description digest-md5
 This plugin implements the latest draft of the SASL DIGEST-MD5
@@ -185,7 +183,7 @@ Summary:    Plain Cyrus SASL plugin
 Summary(pl):   Wtyczka plain do Cyrus SASL
 Summary(pt_BR):        Mecanismo SASL PLAIN
 Group:         Libraries
-Requires:      %{name} = %{version}
+Requires:      %{name} = %{version}-%{release}
 
 %description plain
 This plugin implements the SASL PLAIN mechanism. Although insecure,
@@ -210,7 +208,7 @@ Summary:    Anonymous Cyrus SASL plugin
 Summary(pl):   Wtyczka anonymous do Cyrus SASL
 Summary(pt_BR):        Mecanismo SASL ANONYMOUS
 Group:         Libraries
-Requires:      %{name} = %{version}
+Requires:      %{name} = %{version}-%{release}
 
 %description anonymous
 This plugin implements the SASL ANONYMOUS mechanism, used for
@@ -229,7 +227,7 @@ Summary:    GSSAPI Cyrus SASL plugin
 Summary(pl):   Wtyczka GSSAPI do Cyrus SASL
 Summary(pt_BR):        Mecanismo SASL GSSAPI
 Group:         Libraries
-Requires:      %{name} = %{version}
+Requires:      %{name} = %{version}-%{release}
 
 %description gssapi
 This plugin implements the SASL GSSAPI mechanism, used for
@@ -247,7 +245,7 @@ autentica
 Summary:       Unsupported Login Cyrus SASL plugin
 Summary(pl):   Nie wspierana wtyczka Login do Cyrus SASL
 Group:         Libraries
-Requires:      %{name} = %{version}
+Requires:      %{name} = %{version}-%{release}
 
 %description login
 Unsupported LOGIN Cyrus SASL plugin.
@@ -261,7 +259,7 @@ Summary:    SRP Cyrus SASL plugin
 Summary(pl):   Wtyczka SRP do Cyrus SASL
 Summary(pt_BR):        Mecanismo SASL SRP
 Group:         Libraries
-Requires:      %{name} = %{version}
+Requires:      %{name} = %{version}-%{release}
 
 %description srp
 This plugin implements the SASL SRP mechanism, based on the Secure
@@ -287,7 +285,7 @@ Summary:    OTP Cyrus SASL plugin
 Summary(pl):   Wtyczka OTP do Cyrus SASL
 Summary(pt_BR):        Mecanismo SASL OTP
 Group:         Libraries
-Requires:      %{name} = %{version}
+Requires:      %{name} = %{version}-%{release}
 
 %description otp
 This plugin implements the SASL OTP (One Time Password) mechanism.
@@ -300,7 +298,7 @@ SASL.
 Summary:       x509 Cyrus SASL plugin
 Summary(pl):   Wtyczka x509 do Cyrus SASL
 Group:         Libraries
-Requires:      %{name} = %{version}
+Requires:      %{name} = %{version}-%{release}
 
 %description x509
 x509 Cyrus SASL plugin.
@@ -311,9 +309,9 @@ Wtyczka x509 do Cyrus SASL.
 %package saslauthd
 Summary:       Cyrus SASL authd
 Summary(pl):   Demon authd do Cyrus SASL
-Group:         Libraries
+Group:         Daemons
 Requires(post,postun): /sbin/chkconfig
-Requires:      %{name} = %{version}
+Requires:      %{name} = %{version}-%{release}
 
 %description saslauthd
 Cyrus SASL authd.
@@ -325,7 +323,7 @@ Demon authd do Cyrus SASL.
 Summary:       Cyrus SASL pwcheck helper
 Summary(pl):   Program pomocniczy pwcheck do Cyrus SASL
 Group:         Libraries
-Requires:      %{name} = %{version}
+Requires:      %{name} = %{version}-%{release}
 
 %description pwcheck
 Cyrus SASL pwcheck helper.
@@ -337,7 +335,7 @@ Program pomocniczy pwcheck do Cyrus SASL.
 Summary:       Cyrus SASL sasldb plugin
 Summary(pl):   Wtyczka sasldb do Cyrus SASL
 Group:         Libraries
-Requires:      %{name} = %{version}
+Requires:      %{name} = %{version}-%{release}
 
 %description sasldb
 Cyrus SASL sasldb plugin.
@@ -349,7 +347,7 @@ Wtyczka sasldb do Cyrus SASL.
 Summary:       Cyrus SASL mysql plugin
 Summary(pl):   Wtyczka mysql do Cyrus SASL
 Group:         Libraries
-Requires:      %{name} = %{version}
+Requires:      %{name} = %{version}-%{release}
 
 %description mysql
 Cyrus SASL mysql plugin.
@@ -361,7 +359,7 @@ Wtyczka mysql do Cyrus SASL.
 Summary:       Cyrus SASL PostgreSQL plugin
 Summary(pl):   Wtyczka PostgreSQL do Cyrus SASL
 Group:         Libraries
-Requires:      %{name} = %{version}
+Requires:      %{name} = %{version}-%{release}
 
 %description pgsql
 Cyrus SASL PostgreSQL plugin.
@@ -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}