packages: heimdal/heimdal.spec - rel 6; revert latest change as it is not n...

[arekm]

Author: arekm                        Date: Sat Oct 16 09:20:40 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 6; revert latest change as it is not needed in multilib environment (just make sure you install the same package versions of botch arch)

---- Files affected:
packages/heimdal:
   heimdal.spec (1.217 -> 1.218) 

---- Diffs:

================================================================
Index: packages/heimdal/heimdal.spec
diff -u packages/heimdal/heimdal.spec:1.217 packages/heimdal/heimdal.spec:1.218
--- packages/heimdal/heimdal.spec:1.217	Thu Oct 14 19:26:41 2010
+++ packages/heimdal/heimdal.spec	Sat Oct 16 11:20:35 2010
@@ -8,7 +8,7 @@
 Summary(pl.UTF-8):	Implementacja Heimdal systemu Kerberos V5
 Name:		heimdal
 Version:	1.4
-Release:	5
+Release:	6
 License:	Free
 Group:		Networking
 Source0:	http://www.h5l.org/dist/src/%{name}-%{version}.tar.gz
@@ -92,25 +92,11 @@
 - zawiera wystarczającą kompatybilność z Kerberos V4
 - wsparcie dla IPv6
 
-%package common
-Summary:	Heimdal essential config files and documentation
-Summary(pl.UTF-8):	Niezbędne pliki konfiguracyjne i dokumentacja dla heimdal
-Group:		Networking
-
-%description common
-Package contains essential configs and documentation required
-by heimdal packages.
-
-%description common -l pl.UTF-8
-Pakiet zawiera niezbędne pliki konfiguracyjne i dokumentację
-dla heimdala.
-
 %package libs
 Summary:	Heimdal shared libraries
 Summary(pl.UTF-8):	Biblioteki współdzielone dla heimdal
 Group:		Libraries
 Requires(post,postun):	/sbin/ldconfig
-Requires:	%{name}-common = %{version}-%{release}
 
 %description libs
 Package contains shared libraries required by several of the other
@@ -533,15 +519,14 @@
 	%service -q rc-inetd reload
 fi
 
-%post common
+%post libs
+/sbin/ldconfig
 [ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
 
-%postun common
+%postun libs
+/sbin/ldconfig
 [ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
 
-%post libs -p /sbin/ldconfig
-%postun libs -p /sbin/ldconfig
-
 %if %{with ldap}
 %post -n openldap-schema-heimdal
 %openldap_schema_register %{schemadir}/hdb.schema
@@ -626,18 +611,10 @@
 %{_mandir}/man8/string2key.8*
 %{_mandir}/man8/verify_krb5_conf.8*
 
-%files common
+%files libs
 %defattr(644,root,root,755)
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/krb5.conf
 %attr(400,root,root) %ghost %{_sysconfdir}/krb5.keytab
-%{_infodir}/heimdal.info*
-%{_infodir}/hx509.info*
-%{_mandir}/man5/krb5.conf.5*
-%{_mandir}/man5/mech.5*
-%{_mandir}/man8/kerberos.8*
-
-%files libs
-%defattr(644,root,root,755)
 %attr(755,root,root) /%{_lib}/libasn1.so.*.*.*
 %attr(755,root,root) %ghost /%{_lib}/libasn1.so.8
 %attr(755,root,root) /%{_lib}/libgssapi.so.*.*.*
@@ -668,6 +645,11 @@
 %attr(755,root,root) %ghost /%{_lib}/libwind.so.0
 %dir %{_libdir}/%{name}
 %attr(755,root,root) %{_libdir}/%{name}/*
+%{_infodir}/heimdal.info*
+%{_infodir}/hx509.info*
+%{_mandir}/man5/krb5.conf.5*
+%{_mandir}/man5/mech.5*
+%{_mandir}/man8/kerberos.8*
 
 %files devel
 %defattr(644,root,root,755)
@@ -829,6 +811,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.218  2010/10/16 09:20:35  arekm
+- rel 6; revert latest change as it is not needed in multilib environment (just make sure you install the same package versions of botch arch)
+
 Revision 1.217  2010/10/14 17:26:41  baggins
 - rel 5
 - moved configs and docs out of libs and into common package (for multiarch)
================================================================

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