- updated to 2.1.21, updated nolibs,lt,split-sql patches, removed obsolete db patch

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

diff --git a/cyrus-sasl.spec b/cyrus-sasl.spec
index 0f0ba4c738d9cf69196a7748f861e86f555440ae..54765c671e12de7fd6915ea6d10ae56224329793 100644 (file)
--- a/cyrus-sasl.spec
+++ b/cyrus-sasl.spec
@@ -1,13 +1,14 @@
 #
 # TODO:
 # - add ldap plugin from openldap sources
-# - cleaner solution for mysql/pgsql support
 #
 # 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   # build pgsql pluggin
+%bcond_without gssapi  # do not enable GSSAPI support for saslauthd and build gssapi plugin
+%bcond_without mysql   # don't build MySQL pluggin
+%bcond_without pgsql   # do not build PostgreSQL pluggin
+%bcond_without sqlite  # do not enable sqlite plugin
+%bcond_with    opie    # enable opie plugin
 %bcond_with    srp     # build srp pluggin
 %bcond_with    pwcheck # build pwcheck helper (deprecated)
 %bcond_with    x509    # build x509 plugin (no sources in package???)
@@ -18,30 +19,37 @@ Summary(pt_BR):     Implementa
 Summary(ru):   âÉÂÌÉÏÔÅËÁ Cyrus SASL
 Summary(uk):   â¦Â̦ÏÔÅËÁ Cyrus SASL
 Name:          cyrus-sasl
-Version:       2.1.20
+Version:       2.1.21
 Release:       1
 License:       distributable
 Group:         Libraries
 Source0:       ftp://ftp.andrew.cmu.edu/pub/cyrus/%{name}-%{version}.tar.gz
-# Source0-md5: 268ead27f4ac39bcfe17d9e38e0f2977
+# Source0-md5: dde02db234dea892bee298390890502e
 Source1:       saslauthd.init
 Source2:       saslauthd.sysconfig
 Source3:       %{name}.pam
 Patch0:                %{name}-configdir.patch
 Patch1:                %{name}-nolibs.patch
 Patch2:                %{name}-lt.patch
+Patch3:                %{name}-split-sql.patch
+Patch4:                %{name}-opie.patch
+Patch5:                %{name}-gcc4.patch
 URL:           http://asg.web.cmu.edu/sasl/
 BuildRequires: autoconf >= 2.54
 BuildRequires: automake
 BuildRequires: db-devel
 BuildRequires: ed
+BuildRequires: groff
 %{?with_gssapi:BuildRequires:  heimdal-devel}
 BuildRequires: libtool >= 1.4
 %{?with_mysql:BuildRequires:   mysql-devel}
 %{?with_pgsql:BuildRequires:   postgresql-devel}
 %{?with_ldap:BuildRequires:    openldap-devel}
+%{?with_sqlite:BuildRequires:  sqlite-devel}
+%{?with_opie:BuildRequires:    opie-devel}
 BuildRequires: openssl-devel >= 0.9.7d
 BuildRequires: pam-devel
+Requires:      pam >= 0.79.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _sysconfdir     /etc/sasl
@@ -299,6 +307,20 @@ This plugin implements the SASL OTP (One Time Password) mechanism.
 Wtyczka dodaj±ca obs³ugê mechanizmu OTP (has³a jednorazowe) do Cyrus
 SASL.
 
+%package opie
+Summary:        OPIE Cyrus SASL plugin
+Summary(pl):    Wtyczka OPIE do Cyrus SASL
+Summary(pt_BR): Mecanismo SASL OPIE
+Group:          Libraries
+Requires:       %{name} = %{version}-%{release}
+
+%description opie
+This plugin implements the SASL OPIE (One Time Password) mechanism.
+
+%description opie -l pl
+Wtyczka dodaj±ca obs³ugê mechanizmu OPIE (has³a jednorazowe) do Cyrus
+SASL.
+
 %package x509
 Summary:       x509 Cyrus SASL plugin
 Summary(pl):   Wtyczka x509 do Cyrus SASL
@@ -349,16 +371,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
@@ -372,11 +394,26 @@ Cyrus SASL PostgreSQL plugin.
 %description pgsql -l pl
 Wtyczka PostgreSQL do Cyrus SASL.
 
+%package sqlite
+Summary:        Cyrus SQLite PostgreSQL plugin
+Summary(pl):    Wtyczka SQLite do Cyrus SASL
+Group:          Libraries
+Requires:       %{name} = %{version}-%{release}
+
+%description sqlite
+Cyrus SASL SQLite plugin.
+
+%description sqlite -l pl
+Wtyczka SQLite do Cyrus SASL.
+
 %prep
 %setup -q
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 cd doc
 echo "cyrus-sasl complies with the following RFCs:" > rfc-compliance
@@ -418,6 +455,8 @@ cd ..
        %{?with_ldap: --with-ldap=%{_prefix}} \
        %{?with_mysql: --with-mysql=%{_prefix}} \
        %{?with_pgsql: --with-pgsql=%{_prefix}} \
+       %{?with_sqlite: --with-sqlite=%{_prefix}} \
+       %{?with_opie: --with-opie=%{_prefix}} \
        --with-pam \
        %{?with_pwcheck: --with-pwcheck=/var/lib/sasl2} \
        --with-saslauthd=/var/lib/sasl2
@@ -532,6 +571,12 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/sasl2/libotp.so*
 
+%if %{with opie}
+%files opie
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/sasl2/libopie.so*
+%endif
+
 %files plain
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/sasl2/libplain.so*
@@ -543,13 +588,19 @@ fi
 %if %{with mysql}
 %files mysql
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/sasl2/libsql*.so*
+%attr(755,root,root) %{_libdir}/sasl2/libmysql.so*
 %endif
 
 %if %{with pgsql}
 %files pgsql
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/sasl2/libsql*.so*
+%attr(755,root,root) %{_libdir}/sasl2/libpgsql.so*
+%endif
+
+%if %{with sqlite}
+%files sqlite
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/sasl2/libsqlite.so*
 %endif
 
 %if %{with srp}