packages: heimdal/heimdal.spec - updated db4 patch to honour db4.8 and db5....

Thu May 13 07:58:18 CEST 2010

Author: qboosh                       Date: Thu May 13 05:58:18 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated db4 patch to honour db4.8 and db5.0
- added virtual kerberos5-* Provides

---- Files affected:
packages/heimdal:
   heimdal.spec (1.199 -> 1.200) 

---- Diffs:

================================================================
Index: packages/heimdal/heimdal.spec
diff -u packages/heimdal/heimdal.spec:1.199 packages/heimdal/heimdal.spec:1.200

--- packages/heimdal/heimdal.spec:1.199	Mon Apr 12 14:10:12 2010
+++ packages/heimdal/heimdal.spec	Thu May 13 07:58:12 2010
@@ -1,8 +1,8 @@
 # $Revision$, $Date$
 #
 # Conditional build:
-%bcond_without	x11	# without X11-based utilities
-%bcond_without	ldap
+%bcond_without	x11	# X11-based utilities
+%bcond_without	ldap	# LDAP plugin
 #
 Summary:	Heimdal implementation of Kerberos V5 system
 Summary(pl.UTF-8):	Implementacja Heimdal systemu Kerberos V5
@@ -58,6 +58,8 @@
 %{?with_x11:BuildRequires:	xorg-lib-libXau-devel}
 %{?with_x11:BuildRequires:	xorg-lib-libXt-devel}
 Requires:	%{name}-libs = %{version}-%{release}
+Provides:	kerberos5-client
+Obsoletes:	kerberos5-client
 Conflicts:	krb5-client
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -100,31 +102,6 @@
 %description libs -l pl.UTF-8
 Pakiet zawiera biblioteki współdzielone dla heimdal.
 
-%package ldap
-Summary:	LDAP HDB plugin
-Summary(pl.UTF-8):	Wtyczka HDB LDAP
-Group:		Libraries
-Requires:	%{name}-libs = %{version}-%{release}
-
-%description ldap
-LDAP HDB plugin.
-
-%description ldap -l pl.UTF-8
-Wtyczka HDB LDAP.
-
-%package -n openldap-schema-heimdal
-Summary:	Heimdal LDAP schema
-Summary(pl.UTF-8):	Schemat LDAP dla Heimdala
-Group:		Networking/Daemons
-Requires(post,postun):	sed >= 4.0
-Requires:	openldap-servers
-
-%description -n openldap-schema-heimdal
-This package contains Heimdal kerberos LDAP schema for openldap.
-
-%description -n openldap-schema-heimdal -l pl.UTF-8
-en pakiet zawiera schemat Heimdal kerberosa dla openldap-a.
-
 %package devel
 Summary:	Header files for heimdal
 Summary(pl.UTF-8):	Pliki nagłówkowe i dokumentacja do bibliotek heimdal
@@ -155,6 +132,31 @@
 %description static -l pl.UTF-8
 Biblioteki statyczne heimdal.
 
+%package ldap
+Summary:	LDAP HDB plugin
+Summary(pl.UTF-8):	Wtyczka HDB LDAP
+Group:		Libraries
+Requires:	%{name}-libs = %{version}-%{release}
+
+%description ldap
+LDAP HDB plugin.
+
+%description ldap -l pl.UTF-8
+Wtyczka HDB LDAP.
+
+%package -n openldap-schema-heimdal
+Summary:	Heimdal Kerberos LDAP schema
+Summary(pl.UTF-8):	Schemat LDAP Kerberosa Heimdal
+Group:		Networking/Daemons
+Requires(post,postun):	sed >= 4.0
+Requires:	openldap-servers
+
+%description -n openldap-schema-heimdal
+This package contains Heimdal Kerberos LDAP schema for openldap.
+
+%description -n openldap-schema-heimdal -l pl.UTF-8
+Ten pakiet zawiera schemat LDAP Kerberosa Heimdal dla openldap-a.
+
 %package server
 Summary:	Kerberos Server
 Summary(pl.UTF-8):	Serwer Kerberosa
@@ -162,6 +164,9 @@
 Requires(post,preun):	/sbin/chkconfig
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	rc-scripts
+Provides:	kerberos5-server
+# probably not a good idea
+#Obsoletes:	kerberos5-server
 Conflicts:	krb5-server
 
 %description server
@@ -188,8 +193,8 @@
 Summary(pl.UTF-8):	Narzędzie do logowania w systemie
 Group:		Applications/Networking
 Requires:	%{name}-libs = %{version}-%{release}
-#Provides:	login
-#Obsoletes:	login
+Provides:	kerberos5-login
+Obsoletes:	kerberos5-login
 Conflicts:	shadow < 1:4.0.16
 
 %description login
@@ -209,7 +214,9 @@
 Summary(pl.UTF-8):	Klient protokołu FTP
 Group:		Applications/Networking
 Requires:	%{name}-libs = %{version}-%{release}
+Provides:	kerberos5-ftp
 Obsoletes:	ftp
+Obsoletes:	kerberos5-ftp
 Conflicts:	heimdal-clients
 Conflicts:	krb5-ftp
 
@@ -229,6 +236,8 @@
 Summary(pl.UTF-8):	Klient zdalnego dostępu (rsh, rlogin, rcp)
 Group:		Applications/Networking
 Requires:	%{name}-libs = %{version}-%{release}
+Provides:	kerberos5-rsh
+Obsoletes:	kerberos5-rsh
 Obsoletes:	rsh
 Conflicts:	heimdal-clients
 Conflicts:	krb5-rsh
@@ -250,7 +259,8 @@
 Summary(pl.UTF-8):	Klient usługi telnet
 Group:		Applications/Networking
 Requires:	%{name}-libs = %{version}-%{release}
-Provides:	telnet
+Provides:	kerberos5-telnet
+Obsoletes:	kerberos5-telnet
 Obsoletes:	telnet
 Conflicts:	heimdal-clients
 Conflicts:	krb5-telnet
@@ -269,7 +279,9 @@
 Group:		Networking/Daemons
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	rc-inetd >= 0.8.1
+Provides:	kerberos5-ftpd
 Obsoletes:	ftpd
+Obsoletes:	kerberos5-ftpd
 Conflicts:	krb5-ftpd
 
 %description ftpd
@@ -286,6 +298,8 @@
 Group:		Networking/Daemons
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	rc-inetd >= 0.8.1
+Provides:	kerberos5-rshd
+Obsoletes:	kerberos5-rshd
 Obsoletes:	rshd
 Conflicts:	krb5-rshd
 
@@ -307,6 +321,8 @@
 Group:		Networking/Daemons
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	rc-inetd >= 0.8.1
+Provides:	kerberos5-telnetd
+Obsoletes:	kerberos5-telnetd
 Obsoletes:	telnetd
 Conflicts:	krb5-telnetd
 
@@ -412,7 +428,7 @@
 rm -f $RPM_BUILD_ROOT%{_libdir}/windc.*
 # not needed for plugin
 rm -f $RPM_BUILD_ROOT%{_libdir}/hdb_ldap.{la,a}
-# other implementation exists in e2fsprogs (conflict with e2fsprogs-devel)
+# other implementation exists in e2fsprogs (conflict with libss-{devel,static})
 rm -rf $RPM_BUILD_ROOT{%{_libdir}/libss.{so,la,a},%{_includedir}/ss,%{_bindir}/mk_cmds}
 # this is created because glibc's <glob.h> has no GLOB_LIMIT and GLOB_QUOTE
 rm -f $RPM_BUILD_ROOT%{_includedir}/glob.h
@@ -615,16 +631,6 @@
 %{_mandir}/man5/mech.5*
 %{_mandir}/man8/kerberos.8*
 
-%if %{with ldap}
-%files ldap
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/hdb_ldap.so
-
-%files -n openldap-schema-heimdal
-%defattr(644,root,root,755)
-%{schemadir}/*.schema
-%endif
-
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/krb5-config
@@ -682,6 +688,16 @@
 %{_libdir}/libsl.a
 %{_libdir}/libwind.a
 
+%if %{with ldap}
+%files ldap
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/hdb_ldap.so
+
+%files -n openldap-schema-heimdal
+%defattr(644,root,root,755)
+%{schemadir}/hdb.schema
+%endif
+
 %files kcm
 %defattr(644,root,root,755)
 %attr(754,root,root) /etc/rc.d/init.d/kcm
@@ -777,6 +793,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.200  2010/05/13 05:58:12  qboosh
+- updated db4 patch to honour db4.8 and db5.0
+- added virtual kerberos5-* Provides
+
 Revision 1.199  2010/04/12 12:10:12  baggins
 - rel 1
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/heimdal/heimdal.spec?r1=1.199&r2=1.200&f=u

