- "MySQL" unification

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

diff --git a/cyrus-sasl.spec b/cyrus-sasl.spec
index 810b9b29a358ef129a19617075d2dbb18484c50a..e301edb7d487cdadad3113fd07c4e86f68120ddf 100644 (file)
--- a/cyrus-sasl.spec
+++ b/cyrus-sasl.spec
@@ -6,8 +6,8 @@
 # Conditional build:
 %bcond_without ldap    # disable LDAP support for saslauthd
 %bcond_with    gssapi  # enable GSSAPI support for saslauthd and build gssapi plugin
-%bcond_without mysql   # don't build mysql pluggin
-%bcond_with    pgsql   # don't build pgsql pluggin
+%bcond_without mysql   # don't build MySQL pluggin
+%bcond_with    pgsql   # build pgsql pluggin
 %bcond_with    srp     # build srp pluggin
 %bcond_with    pwcheck # build pwcheck helper (deprecated)
 %bcond_with    x509    # build x509 plugin (no sources in package???)
@@ -18,12 +18,12 @@ Summary(pt_BR):     Implementa
 Summary(ru):   âÉÂÌÉÏÔÅËÁ Cyrus SASL
 Summary(uk):   â¦Â̦ÏÔÅËÁ Cyrus SASL
 Name:          cyrus-sasl
-Version:       2.1.18
+Version:       2.1.20
 Release:       1
 License:       distributable
 Group:         Libraries
 Source0:       ftp://ftp.andrew.cmu.edu/pub/cyrus/%{name}-%{version}.tar.gz
-# Source0-md5: 1eafae95f0289c10f187d8b2bc4032cf
+# Source0-md5: 268ead27f4ac39bcfe17d9e38e0f2977
 Source1:       saslauthd.init
 Source2:       saslauthd.sysconfig
 Source3:       %{name}.pam
@@ -42,7 +42,6 @@ BuildRequires:        libtool >= 1.4
 %{?with_ldap:BuildRequires:    openldap-devel}
 BuildRequires: openssl-devel >= 0.9.7d
 BuildRequires: pam-devel
-Requires(post):        /sbin/ldconfig
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _sysconfdir     /etc/sasl
@@ -53,6 +52,9 @@ authentication, authorization, and security to network protocols. The
 SASL protocol itself is documented in rfc2222; the API standard is a
 work in progress.
 
+Note: remember to install appropriate plugins, or you won't have any
+authentication mechanisms available.
+
 %description -l pl
 Pakiet cyrus-sasl zawiera implementacjê biblioteki API SASL dla
 systemu poczty elektronicznej Cyrusa. Biblioteka ta jest przydatna
@@ -60,6 +62,9 @@ tak
 bezpieczeñstwa protoko³ów sieciowych. Sam protokó³ SASL jest opisany w
 RFC 2222; standaryzacja API jest w toku.
 
+Uwaga: aby by³y dostêpne jakiekolwiek mechanizmy autoryzacji, nale¿y
+doinstalowaæ odpowiednie wtyczki.
+
 %description -l pt_BR
 Esta é uma implementação da API SASL, útil para acrescentar
 autenticação, autorização e seguança (criptografia) para protocolos de
@@ -344,16 +349,16 @@ Cyrus SASL sasldb plugin.
 Wtyczka sasldb do Cyrus SASL.
 
 %package mysql
-Summary:       Cyrus SASL mysql plugin
-Summary(pl):   Wtyczka mysql do Cyrus SASL
+Summary:       Cyrus SASL MySQL plugin
+Summary(pl):   Wtyczka MySQL do Cyrus SASL
 Group:         Libraries
 Requires:      %{name} = %{version}-%{release}
 
 %description mysql
-Cyrus SASL mysql plugin.
+Cyrus SASL MySQL plugin.
 
 %description mysql -l pl
-Wtyczka mysql do Cyrus SASL.
+Wtyczka MySQL do Cyrus SASL.
 
 %package pgsql
 Summary:       Cyrus SASL PostgreSQL plugin
@@ -377,10 +382,13 @@ cd doc
 echo "cyrus-sasl complies with the following RFCs:" > rfc-compliance
 ls rfc*.txt >> rfc-compliance
 rm -f rfc*.txt
+cd ..
 
-%build
+rm -rf autom4te.cache saslauthd/autom4te.cache
 # acinclude.m4 contains only old libtool.m4
-rm -f acinclude.m4 libtool config/libtool.m4
+rm -f acinclude.m4 libtool config/libtool.m4 saslauthd/acinclude.m4
+
+%build
 %{__libtoolize}
 %{__aclocal} -I cmulocal -I config
 %{__autoheader}
@@ -388,12 +396,11 @@ rm -f acinclude.m4 libtool config/libtool.m4
 %{__autoconf}
 
 cd saslauthd
-       rm -f acinclude.m4
-       %{__libtoolize}
-       %{__aclocal} -I ../cmulocal -I ../config -I config
-       %{__autoheader}
-       %{__automake}
-       %{__autoconf}
+%{__libtoolize}
+%{__aclocal} -I ../cmulocal -I ../config -I config
+%{__autoheader}
+%{__automake}
+%{__autoconf}
 cd ..
 
 %configure \
@@ -438,7 +445,8 @@ install -d $RPM_BUILD_ROOT{/var/lib/sasl2,%{_sysconfdir},/etc/{rc.d/init.d,sysco
 rm -rf $RPM_BUILD_ROOT%{_mandir}/cat*
 rm -f $RPM_BUILD_ROOT%{_libdir}/sasl2/*.{la,a}
 
-install {utils,saslauthd}/*.8 $RPM_BUILD_ROOT%{_mandir}/man8
+install utils/*.8 $RPM_BUILD_ROOT%{_mandir}/man8
+install saslauthd/saslauthd.mdoc $RPM_BUILD_ROOT%{_mandir}/man8/saslauthd.8
 
 ln -sf libsasl2.so $RPM_BUILD_ROOT%{_libdir}/libsasl.so
 
@@ -453,10 +461,7 @@ install saslauthd/{testsaslauthd,saslcache} $RPM_BUILD_ROOT%{_sbindir}
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-/sbin/ldconfig
-echo "Remember to install appropriate plugins, or you won't have any mechs available."
-
+%post  -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
 %post saslauthd