fixes for merge review bz 225673

This commit is contained in:
Steve Conklin 2008-01-25 22:54:11 +00:00
parent c92499cc85
commit 0673b7086a

View File

@ -5,7 +5,7 @@
Summary: The Cyrus SASL library Summary: The Cyrus SASL library
Name: cyrus-sasl Name: cyrus-sasl
Version: 2.1.22 Version: 2.1.22
Release: 10%{?dist} Release: 11%{?dist}
License: BSD License: BSD
Group: System Environment/Libraries Group: System Environment/Libraries
# Source0 originally comes from ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/; # Source0 originally comes from ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/;
@ -53,6 +53,7 @@ applications which use the Cyrus SASL library.
%package devel %package devel
Requires: %{name}-lib = %{version}-%{release} Requires: %{name}-lib = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
Group: Development/Libraries Group: Development/Libraries
Summary: Files needed for developing applications with Cyrus SASL Summary: Files needed for developing applications with Cyrus SASL
@ -120,6 +121,7 @@ a directory server, accessed using LDAP, for storing shared secrets.
%prep %prep
%setup -q -a 6 %setup -q -a 6
chmod -x doc/*.html chmod -x doc/*.html
chmod -x include/*.h
%patch10 -p1 -b .db_bundle %patch10 -p1 -b .db_bundle
%patch11 -p1 -b .no_rpath %patch11 -p1 -b .no_rpath
%patch15 -p1 -b .path %patch15 -p1 -b .path
@ -211,6 +213,7 @@ CFLAGS=`echo $CFLAGS $SQL_CFLAGS | cleanup_flags`; export CFLAGS
CPPFLAGS=`echo $CPPFLAGS $SQL_CFLAGS | cleanup_flags`; export CPPFLAGS CPPFLAGS=`echo $CPPFLAGS $SQL_CFLAGS | cleanup_flags`; export CPPFLAGS
LDFLAGS=`echo $LDFLAGS $SQL_LDFLAGS | cleanup_flags`; export LDFLAGS LDFLAGS=`echo $LDFLAGS $SQL_LDFLAGS | cleanup_flags`; export LDFLAGS
%configure \ %configure \
--enable-shared --disable-static \ --enable-shared --disable-static \
--disable-java \ --disable-java \
@ -246,6 +249,7 @@ make -C sample
pushd lib pushd lib
../libtool --tag=CC --mode=link %{__cc} -o sasl2-shared-mechlist -I../include $CFLAGS %{SOURCE7} $LDFLAGS ./libsasl2.la ../libtool --tag=CC --mode=link %{__cc} -o sasl2-shared-mechlist -I../include $CFLAGS %{SOURCE7} $LDFLAGS ./libsasl2.la
%install %install
test "$RPM_BUILD_ROOT" != "/" && rm -rf $RPM_BUILD_ROOT test "$RPM_BUILD_ROOT" != "/" && rm -rf $RPM_BUILD_ROOT
@ -284,9 +288,11 @@ install -m755 lib/sasl2-shared-mechlist $RPM_BUILD_ROOT/%{_sbindir}/
# Remove unpackaged files from the buildroot. # Remove unpackaged files from the buildroot.
rm -f $RPM_BUILD_ROOT%{_libdir}/sasl2/libotp.* rm -f $RPM_BUILD_ROOT%{_libdir}/sasl2/libotp.*
rm -f $RPM_BUILD_ROOT%{_libdir}/sasl2/*.a rm -f $RPM_BUILD_ROOT%{_libdir}/sasl2/*.a
rm -f $RPM_BUILD_ROOT%{_libdir}/sasl2/*.la
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
rm -f $RPM_BUILD_ROOT%{_mandir}/cat8/saslauthd.8 rm -f $RPM_BUILD_ROOT%{_mandir}/cat8/saslauthd.8
%clean %clean
test "$RPM_BUILD_ROOT" != "/" && rm -rf $RPM_BUILD_ROOT test "$RPM_BUILD_ROOT" != "/" && rm -rf $RPM_BUILD_ROOT
@ -316,7 +322,7 @@ fi
%{_sbindir}/saslauthd %{_sbindir}/saslauthd
%{_sbindir}/testsaslauthd %{_sbindir}/testsaslauthd
%config(noreplace) /etc/sysconfig/saslauthd %config(noreplace) /etc/sysconfig/saslauthd
%config /etc/rc.d/init.d/saslauthd /etc/rc.d/init.d/saslauthd
/var/run/saslauthd /var/run/saslauthd
%files lib %files lib
@ -326,45 +332,35 @@ fi
%dir %{_sysconfdir}/sasl2 %dir %{_sysconfdir}/sasl2
%dir %{_plugindir2}/ %dir %{_plugindir2}/
%{_plugindir2}/*anonymous*.so* %{_plugindir2}/*anonymous*.so*
%{_plugindir2}/*anonymous*.la
%{_plugindir2}/*sasldb*.so* %{_plugindir2}/*sasldb*.so*
%{_plugindir2}/*sasldb*.la
%{_sbindir}/saslpasswd2 %{_sbindir}/saslpasswd2
%{_sbindir}/sasldblistusers2 %{_sbindir}/sasldblistusers2
%files plain %files plain
%defattr(-,root,root) %defattr(-,root,root)
%{_plugindir2}/*plain*.so* %{_plugindir2}/*plain*.so*
%{_plugindir2}/*plain*.la
%{_plugindir2}/*login*.so* %{_plugindir2}/*login*.so*
%{_plugindir2}/*login*.la
%files ldap %files ldap
%defattr(-,root,root) %defattr(-,root,root)
%{_plugindir2}/*ldapdb*.so* %{_plugindir2}/*ldapdb*.so*
%{_plugindir2}/*ldapdb*.la
%files md5 %files md5
%defattr(-,root,root) %defattr(-,root,root)
%{_plugindir2}/*crammd5*.so* %{_plugindir2}/*crammd5*.so*
%{_plugindir2}/*crammd5*.la
%{_plugindir2}/*digestmd5*.so* %{_plugindir2}/*digestmd5*.so*
%{_plugindir2}/*digestmd5*.la
%files ntlm %files ntlm
%defattr(-,root,root) %defattr(-,root,root)
%{_plugindir2}/*ntlm*.so* %{_plugindir2}/*ntlm*.so*
%{_plugindir2}/*ntlm*.la
%files sql %files sql
%defattr(-,root,root) %defattr(-,root,root)
%{_plugindir2}/*sql*.so* %{_plugindir2}/*sql*.so*
%{_plugindir2}/*sql*.la
%files gssapi %files gssapi
%defattr(-,root,root) %defattr(-,root,root)
%{_plugindir2}/*gssapi*.so* %{_plugindir2}/*gssapi*.so*
%{_plugindir2}/*gssapi*.la
%files devel %files devel
%defattr(-,root,root) %defattr(-,root,root)
@ -377,6 +373,13 @@ fi
%{_sbindir}/sasl2-shared-mechlist %{_sbindir}/sasl2-shared-mechlist
%changelog %changelog
* Fri Jan 25 2008 Steve Conklin <sconklin@redhat.com> - 2.1.22-11
- Cleanup after merge review bz #225673
- no longer mark /etc/rc.d/init.d/saslauthd as config file
- removed -x permissions on include files
- added devel package dependency on cyrus-sasl
- removed some remaining .la files that were being delivered
* Wed Dec 05 2007 Release Engineering <rel-eng at fedoraproject dot org> - 2.1.22-10 * Wed Dec 05 2007 Release Engineering <rel-eng at fedoraproject dot org> - 2.1.22-10
- Rebuild for deps - Rebuild for deps