packages: heimdal/heimdal.spec - libs split changed to just public/common i...

baggins baggins at pld-linux.org
Mon Aug 1 12:13:16 CEST 2011


Author: baggins                      Date: Mon Aug  1 10:13:16 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- libs split changed to just public/common internal/server packages,
  or we and up with lib-per-package debian like mess.
  Please do not fix private problems by making mess in packages.

---- Files affected:
packages/heimdal:
   heimdal.spec (1.232 -> 1.233) 

---- Diffs:

================================================================
Index: packages/heimdal/heimdal.spec
diff -u packages/heimdal/heimdal.spec:1.232 packages/heimdal/heimdal.spec:1.233
--- packages/heimdal/heimdal.spec:1.232	Sat Jul 30 13:13:19 2011
+++ packages/heimdal/heimdal.spec	Mon Aug  1 12:13:11 2011
@@ -9,7 +9,7 @@
 Summary(pl.UTF-8):	Implementacja Heimdal systemu Kerberos V5
 Name:		heimdal
 Version:	1.4
-Release:	12
+Release:	12.1
 License:	Free
 Group:		Networking
 Source0:	http://www.h5l.org/dist/src/%{name}-%{version}.tar.gz
@@ -61,7 +61,7 @@
 %{?with_x11:BuildRequires:	xorg-lib-libX11-devel}
 %{?with_x11:BuildRequires:	xorg-lib-libXau-devel}
 %{?with_x11:BuildRequires:	xorg-lib-libXt-devel}
-Requires:	%{name}-libs = %{version}-%{release}
+Requires:	%{name}-libs-common = %{version}-%{release}
 Provides:	kerberos5-client
 Obsoletes:	kerberos5-client
 Conflicts:	krb5-client
@@ -98,11 +98,6 @@
 Summary(pl.UTF-8):	Biblioteki współdzielone dla heimdal
 Group:		Libraries
 Requires(post,postun):	/sbin/ldconfig
-Requires:	%{name}-libs-core = %{version}-%{release}
-Requires:	%{name}-libs-database = %{version}-%{release}
-Requires:	%{name}-libs-krb5 = %{version}-%{release}
-Requires:	%{name}-libs-server = %{version}-%{release}
-Requires:	%{name}-libs-support = %{version}-%{release}
 
 %description libs
 Package contains shared libraries required by several of the other
@@ -111,51 +106,31 @@
 %description libs -l pl.UTF-8
 Pakiet zawiera biblioteki współdzielone dla heimdal.
 
-%package libs-core
-Summary:	Heimdal main libraries
-Group:		Libraries
-Requires(post,postun):	/sbin/ldconfig
-
-%description libs-core
-Package contains ASN.1, GSS API, X.509 and roken heimdal libraries.
-
-%package libs-database
-Summary:	Heimdal KDC and kadmin shared libraries
-Group:		Libraries
-Requires(post,postun):	/sbin/ldconfig
-
-%description libs-database
-Package contains shared libraries required to run KDC.
-
-%package libs-krb5
-Summary:	Heimdal krb5 shared library
+%package libs-common
+Summary:	Common libraries used by Heimdal programs
 Group:		Libraries
+Requires:	%{name}-libs = %{version}-%{release}
 Requires(post,postun):	/sbin/ldconfig
 
-%description libs-krb5
-Package contains krb5 shared library from heimdal.
+%description libs-common
+Common libraries used by Heimdal programs.
 
 %package libs-server
-Summary:	Heimdal services support shared libraries
+Summary:	Libraries used by Heimdal KDC server
 Group:		Libraries
+Requires:	%{name}-libs = %{version}-%{release}
 Requires(post,postun):	/sbin/ldconfig
 
 %description libs-server
-Package contains shared libraries required to run heimdal services.
-
-%package libs-support
-Summary:	Heimdal AFS and NTLM libraries
-Group:		Libraries
-Requires(post,postun):	/sbin/ldconfig
-
-%description libs-support
-Package contains shared heimdal AFS and NTLM shared libraries.
+Package contains shared libraries required to run KDC server.
 
 %package devel
 Summary:	Header files for heimdal
 Summary(pl.UTF-8):	Pliki nagłówkowe i dokumentacja do bibliotek heimdal
 Group:		Development/Libraries
 Requires:	%{name}-libs = %{version}-%{release}
+Requires:	%{name}-libs-common = %{version}-%{release}
+Requires:	%{name}-libs-server = %{version}-%{release}
 Requires:	db-devel
 Requires:	libcom_err-devel >= 1.41.11
 Requires:	openssl-devel
@@ -212,7 +187,7 @@
 Summary(pl.UTF-8):	Serwer Kerberosa
 Group:		Networking
 Requires(post,preun):	/sbin/chkconfig
-Requires:	%{name}-libs = %{version}-%{release}
+Requires:	%{name}-libs-server = %{version}-%{release}
 Requires:	rc-scripts
 Provides:	kerberos5-server
 # probably not a good idea
@@ -467,7 +442,7 @@
 install %{SOURCE10} $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/telnetd
 install %{SOURCE11} $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/kadmind
 
-for l in $RPM_BUILD_ROOT%{_libdir}/lib{asn1,gssapi,heimntlm,hx509,krb5,roken,wind}.so; do
+for l in $RPM_BUILD_ROOT%{_libdir}/lib{asn1,gssapi,heimntlm,hx509,kafs,krb5,roken,wind}.so; do
 	lib=`basename $l`
 	mv -f $RPM_BUILD_ROOT%{_libdir}/$lib.* $RPM_BUILD_ROOT/%{_lib}
 	ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/$lib.*.*) $RPM_BUILD_ROOT%{_libdir}/$lib
@@ -574,16 +549,12 @@
 %postun libs
 [ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
 
-%post   libs-core -p /sbin/ldconfig
-%postun libs-core -p /sbin/ldconfig
-%post   libs-database -p /sbin/ldconfig
-%postun libs-database -p /sbin/ldconfig
-%post   libs-krb5 -p /sbin/ldconfig
-%postun libs-krb5 -p /sbin/ldconfig
+%post   libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
+%post   libs-common -p /sbin/ldconfig
+%postun libs-common -p /sbin/ldconfig
 %post   libs-server -p /sbin/ldconfig
 %postun libs-server -p /sbin/ldconfig
-%post   libs-support -p /sbin/ldconfig
-%postun libs-support -p /sbin/ldconfig
 
 %if %{with ldap}
 %post -n openldap-schema-heimdal
@@ -680,45 +651,38 @@
 %{_mandir}/man5/krb5.conf.5*
 %{_mandir}/man5/mech.5*
 %{_mandir}/man8/kerberos.8*
-
-%files libs-core
 %attr(755,root,root) /%{_lib}/libasn1.so.*.*.*
 %attr(755,root,root) %ghost /%{_lib}/libasn1.so.8
 %attr(755,root,root) /%{_lib}/libgssapi.so.*.*.*
 %attr(755,root,root) %ghost /%{_lib}/libgssapi.so.2
-# consider x509 and roken subpackages
+%attr(755,root,root) /%{_lib}/libheimntlm.so.*.*.*
+%attr(755,root,root) %ghost /%{_lib}/libheimntlm.so.0
 %attr(755,root,root) /%{_lib}/libhx509.so.*.*.*
 %attr(755,root,root) %ghost /%{_lib}/libhx509.so.5
+%attr(755,root,root) /%{_lib}/libkafs.so.*.*.*
+%attr(755,root,root) %ghost /%{_lib}/libkafs.so.0
+%attr(755,root,root) /%{_lib}/libkrb5.so.*.*.*
+%attr(755,root,root) %ghost /%{_lib}/libkrb5.so.26
 %attr(755,root,root) /%{_lib}/libroken.so.*.*.*
 %attr(755,root,root) %ghost /%{_lib}/libroken.so.18
+%attr(755,root,root) /%{_lib}/libwind.so.*.*.*
+%attr(755,root,root) %ghost /%{_lib}/libwind.so.0
 
-%files libs-database
+%files libs-common
 %attr(755,root,root) %{_libdir}/libhdb.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libhdb.so.9
 %attr(755,root,root) %{_libdir}/libkadm5clnt.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libkadm5clnt.so.7
 %attr(755,root,root) %{_libdir}/libkadm5srv.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libkadm5srv.so.8
-%attr(755,root,root) %{_libdir}/libkdc.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libkdc.so.2
-
-%files libs-krb5
-%attr(755,root,root) /%{_lib}/libkrb5.so.*.*.*
-%attr(755,root,root) %ghost /%{_lib}/libkrb5.so.26
-
-%files libs-server
 %attr(755,root,root) %{_libdir}/libotp.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libotp.so.0
 %attr(755,root,root) %{_libdir}/libsl.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libsl.so.0
 
-%files libs-support
-%attr(755,root,root) %{_libdir}/libkafs.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libkafs.so.0
-%attr(755,root,root) /%{_lib}/libheimntlm.so.*.*.*
-%attr(755,root,root) %ghost /%{_lib}/libheimntlm.so.0
-%attr(755,root,root) /%{_lib}/libwind.so.*.*.*
-%attr(755,root,root) %ghost /%{_lib}/libwind.so.0
+%files libs-server
+%attr(755,root,root) %{_libdir}/libkdc.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkdc.so.2
 
 %files devel
 %defattr(644,root,root,755)
@@ -880,6 +844,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.233  2011/08/01 10:13:11  baggins
+- libs split changed to just public/common internal/server packages,
+  or we and up with lib-per-package debian like mess.
+  Please do not fix private problems by making mess in packages.
+
 Revision 1.232  2011/07/30 11:13:19  gotar
 - adjusted %post(un) for ntlm->support transition
 
================================================================

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



More information about the pld-cvs-commit mailing list