SPECS (rpm-4_4_9): rpm.spec - updated perl-macros patch to handle ...

[qboosh]

Author: qboosh                       Date: Mon Mar 24 01:28:56 2008 GMT
Module: SPECS                         Tag: rpm-4_4_9
---- Log message:
- updated perl-macros patch to handle different forms of "require version" deps
- perl_req patch dropped (merged into perl-macros)
- removed /usr symlinks from -lib (already in -devel, where they should be)

---- Files affected:
SPECS:
   rpm.spec (1.837.2.55 -> 1.837.2.56) 

---- Diffs:

================================================================
Index: SPECS/rpm.spec
diff -u SPECS/rpm.spec:1.837.2.55 SPECS/rpm.spec:1.837.2.56
--- SPECS/rpm.spec:1.837.2.55	Sun Mar 23 23:48:19 2008
+++ SPECS/rpm.spec	Mon Mar 24 02:28:51 2008
@@ -78,7 +78,7 @@
 Patch15:	%{name}-system_libs-more.patch
 Patch16:	%{name}-php-deps.patch
 Patch17:	%{name}-ldconfig-always.patch
-Patch18:	%{name}-perl_req.patch
+
 Patch19:	%{name}-link.patch
 Patch20:	%{name}-magic-usesystem.patch
 Patch21:	%{name}-dontneedutils.patch
@@ -645,7 +645,6 @@
 %patch15 -p1
 %patch16 -p1
 %patch17 -p1
-%patch18 -p1
 sed -e 's/^/@pld@/' %{SOURCE2} >>platform.in
 #cp -f platform.in macros.pld.in # what for?
 echo '%%define	__perl_provides	%%{__perl} /usr/lib/rpm/perl.prov' > macros.perl
@@ -1120,13 +1119,13 @@
 
 %files lib
 %defattr(644,root,root,755)
-%attr(755,root,root) /%{_lib}/librpm*-*.so
-%attr(755,root,root) %{_libdir}/librpm*-*.so
+%attr(755,root,root) /%{_lib}/librpm-%{sover}.so
+%attr(755,root,root) /%{_lib}/librpmdb-%{sover}.so
+%attr(755,root,root) /%{_lib}/librpmio-%{sover}.so
+%attr(755,root,root) %{_libdir}/librpmbuild-%{sover}.so
 
 %files devel
 %defattr(644,root,root,755)
-%{_includedir}/rpm
-%{_libdir}/librpm*.la
 %attr(755,root,root) %{_libdir}/librpm.so
 %attr(755,root,root) %{_libdir}/librpm-%{sover}.so
 %attr(755,root,root) %{_libdir}/librpmio.so
@@ -1134,10 +1133,18 @@
 %attr(755,root,root) %{_libdir}/librpmdb.so
 %attr(755,root,root) %{_libdir}/librpmdb-%{sover}.so
 %attr(755,root,root) %{_libdir}/librpmbuild.so
+%{_libdir}/librpm.la
+%{_libdir}/librpmbuild.la
+%{_libdir}/librpmdb.la
+%{_libdir}/librpmio.la
+%{_includedir}/rpm
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/librpm*.a
+%{_libdir}/librpm.a
+%{_libdir}/librpmbuild.a
+%{_libdir}/librpmdb.a
+%{_libdir}/librpmio.a
 
 %files utils
 %defattr(644,root,root,755)
@@ -1286,6 +1293,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.837.2.56  2008-03-24 01:28:51  qboosh
+- updated perl-macros patch to handle different forms of "require version" deps
+- perl_req patch dropped (merged into perl-macros)
+- removed /usr symlinks from -lib (already in -devel, where they should be)
+
 Revision 1.837.2.55  2008-03-23 22:48:19  qboosh
 - umask for mkdir in pretrans
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/rpm.spec?r1=1.837.2.55&r2=1.837.2.56&f=u