packages: heimdal/heimdal.spec - moved configs and docs out of libs and int...
baggins
baggins at pld-linux.org
Mon Aug 1 12:36:23 CEST 2011
Author: baggins Date: Mon Aug 1 10:36:23 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- moved configs and docs out of libs and into common package so non-users
don't keep useless files
---- Files affected:
packages/heimdal:
heimdal.spec (1.234 -> 1.235)
---- Diffs:
================================================================
Index: packages/heimdal/heimdal.spec
diff -u packages/heimdal/heimdal.spec:1.234 packages/heimdal/heimdal.spec:1.235
--- packages/heimdal/heimdal.spec:1.234 Mon Aug 1 12:14:06 2011
+++ packages/heimdal/heimdal.spec Mon Aug 1 12:36:17 2011
@@ -93,6 +93,19 @@
- 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
@@ -109,6 +122,7 @@
%package libs-common
Summary: Common libraries used by Heimdal programs
Group: Libraries
+Requires: %{name}-common = %{version}-%{release}
Requires: %{name}-libs = %{version}-%{release}
Requires(post,postun): /sbin/ldconfig
@@ -118,7 +132,7 @@
%package libs-server
Summary: Libraries used by Heimdal KDC server
Group: Libraries
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs-common = %{version}-%{release}
Requires(post,postun): /sbin/ldconfig
%description libs-server
@@ -161,7 +175,7 @@
Summary: LDAP HDB plugin
Summary(pl.UTF-8): Wtyczka HDB LDAP
Group: Libraries
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs-common = %{version}-%{release}
%description ldap
LDAP HDB plugin.
@@ -204,7 +218,7 @@
Summary: KCM - credencial cache daemon for Kerberos tickets
Summary(pl.UTF-8): KCM - demon zapamiętujący dane uwierzytelniające dla biletów Kerberosa
Group: Daemons
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs-common = %{version}-%{release}
%description kcm
KCM is a credencial cache daemon for Kerberos tickets.
@@ -217,7 +231,7 @@
Summary: login is used when signing onto a system
Summary(pl.UTF-8): Narzędzie do logowania w systemie
Group: Applications/Networking
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs-common = %{version}-%{release}
Provides: kerberos5-login
Obsoletes: kerberos5-login
Conflicts: shadow < 1:4.0.16
@@ -238,7 +252,7 @@
Summary: The standard UNIX FTP (file transfer protocol) client
Summary(pl.UTF-8): Klient protokołu FTP
Group: Applications/Networking
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs-common = %{version}-%{release}
Provides: kerberos5-ftp
Obsoletes: ftp
Obsoletes: kerberos5-ftp
@@ -260,7 +274,7 @@
Summary: Clients for remote access commands (rsh, rlogin, rcp)
Summary(pl.UTF-8): Klient zdalnego dostępu (rsh, rlogin, rcp)
Group: Applications/Networking
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs-common = %{version}-%{release}
Provides: kerberos5-rsh
Obsoletes: kerberos5-rsh
Obsoletes: rsh
@@ -283,7 +297,7 @@
Summary: Client for the telnet remote login
Summary(pl.UTF-8): Klient usługi telnet
Group: Applications/Networking
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs-common = %{version}-%{release}
Provides: kerberos5-telnet
Obsoletes: kerberos5-telnet
Obsoletes: telnet
@@ -302,7 +316,7 @@
Summary: The standard UNIX FTP (file transfer protocol) server
Summary(pl.UTF-8): Serwer FTP
Group: Networking/Daemons
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs-common = %{version}-%{release}
Requires: rc-inetd >= 0.8.1
Provides: kerberos5-ftpd
Obsoletes: ftpd
@@ -321,7 +335,7 @@
Summary: Server for remote access commands (rsh, rlogin, rcp)
Summary(pl.UTF-8): Serwer zdalnego dostępu (rsh, rlogin, rcp)
Group: Networking/Daemons
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs-common = %{version}-%{release}
Requires: rc-inetd >= 0.8.1
Provides: kerberos5-rshd
Obsoletes: kerberos5-rshd
@@ -344,7 +358,7 @@
Summary: Server for the telnet remote login
Summary(pl.UTF-8): Serwer protokołu telnet
Group: Networking/Daemons
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs-common = %{version}-%{release}
Requires: rc-inetd >= 0.8.1
Provides: kerberos5-telnetd
Obsoletes: kerberos5-telnetd
@@ -365,7 +379,7 @@
Summary: Kerberos daemons programs for use on servers
Summary(pl.UTF-8): Serwery popularnych usług, autoryzujące przy pomocy kerberosa
Group: Networking
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs-common = %{version}-%{release}
%description daemons
Kerberos Daemons.
@@ -468,10 +482,6 @@
%{__rm} $RPM_BUILD_ROOT%{_libdir}/windc.*
# not needed for plugin
%{__rm} $RPM_BUILD_ROOT%{_libdir}/hdb_ldap.{la,a}
-# other implementation exists in e2fsprogs (conflict with libss-{devel,static})
-%{__rm} -r $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} $RPM_BUILD_ROOT%{_includedir}/glob.h
# resolve heimdal-libs/krb5-libs conflict
%{__mv} $RPM_BUILD_ROOT%{_mandir}/man5/{krb5.conf.5,krb5.conf.5h}
# resolve conflict with gss
@@ -543,14 +553,14 @@
%service -q rc-inetd reload
fi
-%post libs
-/sbin/ldconfig
+%post common
[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
-%postun libs
-/sbin/ldconfig
+%postun common
[ ! -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
%post libs-common -p /sbin/ldconfig
%postun libs-common -p /sbin/ldconfig
%post libs-server -p /sbin/ldconfig
@@ -640,7 +650,7 @@
%{_mandir}/man8/string2key.8*
%{_mandir}/man8/verify_krb5_conf.8*
-%files libs
+%files common
%defattr(644,root,root,755)
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/krb5.conf
%attr(400,root,root) %ghost %{_sysconfdir}/krb5.keytab
@@ -651,6 +661,9 @@
%{_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.*.*.*
@@ -669,6 +682,7 @@
%attr(755,root,root) %ghost /%{_lib}/libwind.so.0
%files libs-common
+%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libhdb.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libhdb.so.9
%attr(755,root,root) %{_libdir}/libkadm5clnt.so.*.*.*
@@ -681,6 +695,7 @@
%attr(755,root,root) %ghost %{_libdir}/libsl.so.0
%files libs-server
+%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libkdc.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libkdc.so.2
@@ -844,6 +859,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.235 2011/08/01 10:36:17 baggins
+- moved configs and docs out of libs and into common package so non-users
+ don't keep useless files
+
Revision 1.234 2011/08/01 10:14:06 baggins
- removed second post
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/heimdal/heimdal.spec?r1=1.234&r2=1.235&f=u
More information about the pld-cvs-commit
mailing list