- remove rfc documents (they are in the rfc-{text,basic} packages)

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

diff --git a/cyrus-sasl.spec b/cyrus-sasl.spec
index 109049364385b8f33328b25d5e86fe3e7a1d3035..25090d689eb529dd2eb6e3ac18325329c07aaa9d 100644 (file)
--- a/cyrus-sasl.spec
+++ b/cyrus-sasl.spec
@@ -10,8 +10,8 @@ Summary(pt_BR):       Implementa
 Summary(ru):   âÉÂÌÉÏÔÅËÁ Cyrus SASL
 Summary(uk):   â¦Â̦ÏÔÅËÁ Cyrus SASL
 Name:          cyrus-sasl
-Version:       2.1.10
-Release:       1
+Version:       2.1.12
+Release:       2
 License:       distributable
 Group:         Libraries
 Source0:       ftp://ftp.andrew.cmu.edu/pub/cyrus-mail//%{name}-%{version}.tar.gz
@@ -21,13 +21,14 @@ Source3:    %{name}.pam
 Patch0:                %{name}-configdir.patch
 Patch1:                %{name}-nolibs.patch
 Patch2:                %{name}-lt14d.patch
+Patch3:                %{name}-do_dlopen.patch
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: db-devel
 BuildRequires: libtool >= 1.4
 %{!?_without_mysql:BuildRequires: mysql-devel}
 %{!?_without_ldap:BuildRequires: openldap-devel}
-BuildRequires: openssl-devel >= 0.9.6a
+BuildRequires: openssl-devel >= 0.9.7
 BuildRequires: pam-devel
 URL:           http://asg.web.cmu.edu/sasl/
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -35,7 +36,7 @@ BuildRoot:    %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define                _sysconfdir     /etc/sasl
 
 %description
-This is an implemention of the SASL API, useful for adding
+This is an implementation of the SASL API, useful for adding
 authentication, authorization, and security to network protocols. The
 SASL protocol itself is documented in rfc2222; the API standard is a
 work in progress.
@@ -328,6 +329,13 @@ Wtyczka mysql do Cyrus SASL.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+
+cd doc
+echo "cyrus-sasl complies with the following RFCs:" > rfc-compliance
+ls rfc*.txt >> rfc-compliance
+rm -f rfc*.txt
+cd ..
 
 %build
 # acinclude.m4 contains only old libtool.m4
@@ -362,9 +370,17 @@ LDFLAGS="%{rpmldflags} -ldl"; export LDFLAGS
        --disable-gssapi
 %{__make}
 
+cd doc
+RFCLIST=`grep 'rfc.+\.txt' rfc-compliance`
+for i in $RFCLIST; do
+       RFCDIR=../RFC/text/`echo $i | sed -e 's:^rfc::' -e 's:..\.txt$::' `00
+       echo -e ',s:'$i':'$RFCDIR/$i\n,w\nq' | ed index.html
+done
+cd ..
+
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/var/lib/sasl2,%{_sysconfdir},/etc/{rc.d/init.d,sysconfig,pam.d}} \
+install -d $RPM_BUILD_ROOT{/var/lib/sasl2,%{_sysconfdir},/etc/{rc.d/init.d,sysconfig}} \
                $RPM_BUILD_ROOT%{_mandir}/man8
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
@@ -379,7 +395,7 @@ touch $RPM_BUILD_ROOT/var/lib/sasl2/sasl.db
 
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/saslauthd
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/saslauthd
-install %{SOURCE3} $RPM_BUILD_ROOT/etc/pam.d/cyrus
+install %{SOURCE3} ./cyrus.pam
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -406,7 +422,7 @@ fi
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS COPYING ChangeLog NEWS README
-%doc doc/{ONEWS,TODO,*.txt,*.html,*.fig}
+%doc doc/{ONEWS,TODO,*.txt,*.html,*.fig,rfc-compliance}
 %dir %{_sysconfdir}
 %dir %{_libdir}/sasl2
 %dir /var/lib/sasl2
@@ -458,9 +474,11 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/sasl2/libsasldb.so*
 
+%if %{!?_without_mysql:1}%{?_without_mysql:0}
 %files mysql
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/sasl2/libmysql*.so*
+%endif
 
 %if %{?_with_srp:1}%{?!_with_srp:0}
 %files srp
@@ -482,8 +500,8 @@ fi
 
 %files saslauthd
 %defattr(644,root,root,755)
+%doc cyrus.pam
 %attr(755,root,root) %{_sbindir}/saslauthd
 %attr(754,root,root) /etc/rc.d/init.d/saslauthd
 %config(noreplace) %verify(not mtime md5 size) /etc/sysconfig/saslauthd
-%config(noreplace) %verify(not mtime md5 size) /etc/pam.d/cyrus
 %{_mandir}/man8/saslauthd.*