rpms/cyrus-sasl/devel cyrus-sasl.spec,1.63,1.64
Steve Conklin (sconklin)
fedora-extras-commits at redhat.com
Fri Jan 25 22:54:45 UTC 2008
- Previous message (by thread): rpms/bodhi/F-8 .cvsignore, 1.10, 1.11 bodhi.spec, 1.11, 1.12 sources, 1.11, 1.12
- Next message (by thread): rpms/goffice/devel .cvsignore, 1.5, 1.6 goffice.spec, 1.14, 1.15 sources, 1.5, 1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: sconklin
Update of /cvs/pkgs/rpms/cyrus-sasl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32177
Modified Files:
cyrus-sasl.spec
Log Message:
fixes for merge review bz 225673
Index: cyrus-sasl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cyrus-sasl/devel/cyrus-sasl.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- cyrus-sasl.spec 6 Dec 2007 00:49:09 -0000 1.63
+++ cyrus-sasl.spec 25 Jan 2008 22:54:11 -0000 1.64
@@ -5,7 +5,7 @@
Summary: The Cyrus SASL library
Name: cyrus-sasl
Version: 2.1.22
-Release: 10%{?dist}
+Release: 11%{?dist}
License: BSD
Group: System Environment/Libraries
# Source0 originally comes from ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/;
@@ -53,6 +53,7 @@
%package devel
Requires: %{name}-lib = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
Group: Development/Libraries
Summary: Files needed for developing applications with Cyrus SASL
@@ -120,6 +121,7 @@
%prep
%setup -q -a 6
chmod -x doc/*.html
+chmod -x include/*.h
%patch10 -p1 -b .db_bundle
%patch11 -p1 -b .no_rpath
%patch15 -p1 -b .path
@@ -211,6 +213,7 @@
CPPFLAGS=`echo $CPPFLAGS $SQL_CFLAGS | cleanup_flags`; export CPPFLAGS
LDFLAGS=`echo $LDFLAGS $SQL_LDFLAGS | cleanup_flags`; export LDFLAGS
+
%configure \
--enable-shared --disable-static \
--disable-java \
@@ -246,6 +249,7 @@
pushd lib
../libtool --tag=CC --mode=link %{__cc} -o sasl2-shared-mechlist -I../include $CFLAGS %{SOURCE7} $LDFLAGS ./libsasl2.la
+
%install
test "$RPM_BUILD_ROOT" != "/" && rm -rf $RPM_BUILD_ROOT
@@ -284,9 +288,11 @@
# Remove unpackaged files from the buildroot.
rm -f $RPM_BUILD_ROOT%{_libdir}/sasl2/libotp.*
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%{_mandir}/cat8/saslauthd.8
+
%clean
test "$RPM_BUILD_ROOT" != "/" && rm -rf $RPM_BUILD_ROOT
@@ -316,7 +322,7 @@
%{_sbindir}/saslauthd
%{_sbindir}/testsaslauthd
%config(noreplace) /etc/sysconfig/saslauthd
-%config /etc/rc.d/init.d/saslauthd
+/etc/rc.d/init.d/saslauthd
/var/run/saslauthd
%files lib
@@ -326,45 +332,35 @@
%dir %{_sysconfdir}/sasl2
%dir %{_plugindir2}/
%{_plugindir2}/*anonymous*.so*
-%{_plugindir2}/*anonymous*.la
%{_plugindir2}/*sasldb*.so*
-%{_plugindir2}/*sasldb*.la
%{_sbindir}/saslpasswd2
%{_sbindir}/sasldblistusers2
%files plain
%defattr(-,root,root)
%{_plugindir2}/*plain*.so*
-%{_plugindir2}/*plain*.la
%{_plugindir2}/*login*.so*
-%{_plugindir2}/*login*.la
%files ldap
%defattr(-,root,root)
%{_plugindir2}/*ldapdb*.so*
-%{_plugindir2}/*ldapdb*.la
%files md5
%defattr(-,root,root)
%{_plugindir2}/*crammd5*.so*
-%{_plugindir2}/*crammd5*.la
%{_plugindir2}/*digestmd5*.so*
-%{_plugindir2}/*digestmd5*.la
%files ntlm
%defattr(-,root,root)
%{_plugindir2}/*ntlm*.so*
-%{_plugindir2}/*ntlm*.la
%files sql
%defattr(-,root,root)
%{_plugindir2}/*sql*.so*
-%{_plugindir2}/*sql*.la
%files gssapi
%defattr(-,root,root)
%{_plugindir2}/*gssapi*.so*
-%{_plugindir2}/*gssapi*.la
%files devel
%defattr(-,root,root)
@@ -377,6 +373,13 @@
%{_sbindir}/sasl2-shared-mechlist
%changelog
+* Fri Jan 25 2008 Steve Conklin <sconklin at 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
- Rebuild for deps
- Previous message (by thread): rpms/bodhi/F-8 .cvsignore, 1.10, 1.11 bodhi.spec, 1.11, 1.12 sources, 1.11, 1.12
- Next message (by thread): rpms/goffice/devel .cvsignore, 1.5, 1.6 goffice.spec, 1.14, 1.15 sources, 1.5, 1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list