packages: heimdal/heimdal.spec - adjusted %descriptions, no --force in %ins...

[gotar]

Author: gotar                        Date: Sat Jul 30 11:11:16 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- adjusted %descriptions, no --force in %install, one TODO to consider

---- Files affected:
packages/heimdal:
   heimdal.spec (1.230 -> 1.231) 

---- Diffs:

================================================================
Index: packages/heimdal/heimdal.spec
diff -u packages/heimdal/heimdal.spec:1.230 packages/heimdal/heimdal.spec:1.231
--- packages/heimdal/heimdal.spec:1.230	Sat Jul 30 12:29:53 2011
+++ packages/heimdal/heimdal.spec	Sat Jul 30 13:11:11 2011
@@ -112,12 +112,12 @@
 Pakiet zawiera biblioteki współdzielone dla heimdal.
 
 %package libs-core
-Summary:	Heimdal core libraries
+Summary:	Heimdal main libraries
 Group:		Libraries
 Requires(post,postun):	/sbin/ldconfig
 
 %description libs-core
-Package contains main heimdal libraries.
+Package contains ASN.1, GSS API, X.509 and roken heimdal libraries.
 
 %package libs-database
 Summary:	Heimdal KDC and kadmin shared libraries
@@ -144,12 +144,12 @@
 Package contains shared libraries required to run heimdal services.
 
 %package libs-support
-Summary:	Heimdal support libraries
+Summary:	Heimdal AFS and NTLM libraries
 Group:		Libraries
 Requires(post,postun):	/sbin/ldconfig
 
 %description libs-support
-Package contains shared heimdal support libraries.
+Package contains shared heimdal AFS and NTLM shared libraries.
 
 %package devel
 Summary:	Header files for heimdal
@@ -490,19 +490,19 @@
 %endif
 
 # just a test plugin
-rm -f $RPM_BUILD_ROOT%{_libdir}/windc.*
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/windc.*
 # not needed for plugin
-rm -f $RPM_BUILD_ROOT%{_libdir}/hdb_ldap.{la,a}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/hdb_ldap.{la,a}
 # 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}
+%{__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 -f $RPM_BUILD_ROOT%{_includedir}/glob.h
+%{__rm} $RPM_BUILD_ROOT%{_includedir}/glob.h
 # resolve heimdal-libs/krb5-libs conflict
-mv -f $RPM_BUILD_ROOT%{_mandir}/man5/{krb5.conf.5,krb5.conf.5h}
+%{__mv} $RPM_BUILD_ROOT%{_mandir}/man5/{krb5.conf.5,krb5.conf.5h}
 # resolve conflict with gss
-mv -f $RPM_BUILD_ROOT%{_bindir}/{gss,gsscmd}
+%{__mv} $RPM_BUILD_ROOT%{_bindir}/{gss,gsscmd}
 # unpackaged
-rm -f $RPM_BUILD_ROOT%{_infodir}/dir
+%{__rm} $RPM_BUILD_ROOT%{_infodir}/dir
 
 touch $RPM_BUILD_ROOT{%{_sysconfdir}/krb5.keytab,%{_localstatedir}/kadmind.acl}
 
@@ -686,6 +686,7 @@
 %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}/libhx509.so.*.*.*
 %attr(755,root,root) %ghost /%{_lib}/libhx509.so.5
 %attr(755,root,root) /%{_lib}/libroken.so.*.*.*
@@ -879,6 +880,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.231  2011/07/30 11:11:11  gotar
+- adjusted %descriptions, no --force in %install, one TODO to consider
+
 Revision 1.230  2011/07/30 10:29:53  gotar
 - separating NTLM doesn't make much sense, they were never bumped and are
   required by gssapi (ntlm), hx509 and krb5 (wind); packaged with kafs
================================================================

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