Author: glen Date: Mon Mar 24 07:06:40 2008 GMT Module: SPECS Tag: AC-branch ---- Log message: - HEAD merge (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)
---- Files affected: SPECS: rpm.spec (1.837.2.42.2.26 -> 1.837.2.42.2.27) ---- Diffs: ================================================================ Index: SPECS/rpm.spec diff -u SPECS/rpm.spec:1.837.2.42.2.26 SPECS/rpm.spec:1.837.2.42.2.27 --- SPECS/rpm.spec:1.837.2.42.2.26 Fri Mar 14 00:56:27 2008 +++ SPECS/rpm.spec Mon Mar 24 08:06:35 2008 @@ -36,7 +36,7 @@ Summary(uk.UTF-8): Менеджер пакетів від RPM Name: rpm Version: 4.4.9 -Release: 52 +Release: 53 License: LGPL Group: Base Source0: http://rpm5.org/files/rpm/rpm-4.4/%{name}-%{version}.tar.gz @@ -82,7 +82,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 @@ -132,6 +132,7 @@ Patch67: %{name}-cleanbody.patch Patch68: %{name}-rpm5-patchset-9486.patch Patch69: %{name}-popt-downgrade.patch +Patch70: %{name}-lualeak.patch URL: http://rpm5.org/ BuildRequires: autoconf >= 2.57 BuildRequires: automake >= 1.4 @@ -651,7 +652,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 @@ -713,6 +713,7 @@ %patch67 -p1 %patch68 -p1 %patch69 -p1 +%patch70 -p1 mv -f scripts/{perl.req,perl.req.in} mv -f scripts/{perl.prov,perl.prov.in} @@ -1087,6 +1088,7 @@ %pretrans # this needs to be a dir if [ -f %{_sysconfdir}/rpm/sysinfo ]; then + umask 022 mv -f %{_sysconfdir}/rpm/sysinfo{,.rpmsave} mkdir %{_sysconfdir}/rpm/sysinfo fi @@ -1156,13 +1158,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 @@ -1170,10 +1172,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) @@ -1322,6 +1332,12 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.837.2.42.2.27 2008-03-24 07:06:35 glen +- HEAD merge (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.42.2.26 2008-03-13 23:56:27 glen - seems %_tmppath leaks, rel 52 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/rpm.spec?r1=1.837.2.42.2.26&r2=1.837.2.42.2.27&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
