rpms/cyrus-sasl/F-11 cyrus-sasl.spec,1.77,1.78

Robert Scheck robert at fedoraproject.org
Thu Apr 16 01:17:27 UTC 2009


Author: robert

Update of /cvs/pkgs/rpms/cyrus-sasl/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14143

Modified Files:
	cyrus-sasl.spec 
Log Message:
Don't build the krb4 plugin as krb5 1.7 will drop it (#225974 #c6)

This is temporary required because F12 is already shipping krb5 without
krb4 support, thus rebuilding of cyrus-sasl in F12 without krb4 support
fails as cyrus-sasl is part of the mock build root. I will enable this
afterwards in F11 again to avoid F11 breakage and once F12 builds fit so
far...



Index: cyrus-sasl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cyrus-sasl/F-11/cyrus-sasl.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- cyrus-sasl.spec	24 Feb 2009 10:39:32 -0000	1.77
+++ cyrus-sasl.spec	16 Apr 2009 01:16:57 -0000	1.78
@@ -4,7 +4,7 @@
 Summary: The Cyrus SASL library
 Name: cyrus-sasl
 Version: 2.1.22
-Release: 22%{?dist}
+Release: 22.1%{?dist}
 License: BSD
 Group: System Environment/Libraries
 # Source0 originally comes from ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/;
@@ -124,15 +124,6 @@
 a directory server, accessed using LDAP, for storing shared secrets.
 %endif
 
-%package krb4
-Requires: %{name}-lib = %{version}-%{release}
-Group: System Environment/Libraries
-Summary: Kerberos 4 authentication support for Cyrus SASL
-
-%description krb4
-The %{name}-krb4 package contains the Cyrus SASL plugins which
-support Kerberos 4 authentication.
-
 %prep
 %setup -q
 chmod -x doc/*.html
@@ -223,7 +214,7 @@
         --disable-java \
         --with-plugindir=%{_plugindir2} \
         --with-configdir=%{_plugindir2}:%{_sysconfdir}/sasl2 \
-        --enable-krb4=/usr \
+        --disable-krb4 \
         --enable-gssapi${krb5_prefix:+=${krb5_prefix}} \
         --with-gss_impl=mit \
         --with-rc4 \
@@ -370,10 +361,6 @@
 %defattr(-,root,root)
 %{_plugindir2}/*gssapi*.so*
 
-%files krb4
-%defattr(-,root,root)
-%{_plugindir2}/*kerberos4*.so*
-
 %files devel
 %defattr(-,root,root)
 %doc doc/*.txt
@@ -385,6 +372,9 @@
 %{_sbindir}/sasl2-shared-mechlist
 
 %changelog
+* Thu Apr 16 2009 Robert Scheck <robert at fedoraproject.org> - 2.1.22-22.1
+- Don't build the krb4 plugin as krb5 1.7 will drop it (#225974 #c6)
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.22-22
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 




More information about the scm-commits mailing list