Author: hawk Date: Wed Mar 26 14:34:18 2008 GMT Module: SPECS Tag: Titanium ---- Log message: - merged from rpm-4_4_9 branch: - add /var/cache/hrmib dir and initial fillup - sync poldek/rpm commandline args: add --downgrade to rpm - umask for mkdir in pretrans - 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) - noautoreqdep libdns_sd.so.1 - don't hardcode python version
---- Files affected: SPECS: rpm.spec (1.837.4.11 -> 1.837.4.12) ---- Diffs: ================================================================ Index: SPECS/rpm.spec diff -u SPECS/rpm.spec:1.837.4.11 SPECS/rpm.spec:1.837.4.12 --- SPECS/rpm.spec:1.837.4.11 Sun Feb 17 00:11:39 2008 +++ SPECS/rpm.spec Wed Mar 26 15:34:13 2008 @@ -36,7 +36,7 @@ Summary(uk.UTF-8): ĐĐľĐ˝ĐľĐ´ĐśĐľŃ ĐżĐ°ĐşĐľŃŃв вŃĐ´ RPM Name: rpm Version: 4.4.9 -Release: 37 +Release: 54 License: LGPL Group: Base Source0: http://rpm5.org/files/rpm/rpm-4.4/%{name}-%{version}.tar.gz @@ -45,6 +45,7 @@ Source2: %{name}.platform Source3: %{name}-install-tree Source4: %{name}-find-spec-bcond +Source5: %{name}-hrmib-cache Source6: %{name}-groups-po.awk Source7: %{name}-compress-doc Source9: %{name}-php-provides @@ -75,7 +76,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 @@ -124,6 +125,7 @@ Patch66: %{name}-v3-support.patch Patch67: %{name}-cleanbody.patch Patch68: %{name}-rpm5-patchset-9486.patch +Patch69: %{name}-popt-downgrade.patch URL: http://rpm5.org/ BuildRequires: autoconf >= 2.57 BuildRequires: automake >= 1.4 @@ -143,8 +145,8 @@ %endif BuildRequires: patch >= 2.2 BuildRequires: popt-devel >= %{reqpopt_ver} -%{?with_python:BuildRequires: python-devel >= 1:2.5} -BuildRequires: python-modules >= 1:2.5 +%{?with_python:BuildRequires: python-devel >= 1:2.3} +BuildRequires: python-modules >= 1:2.3 BuildRequires: rpm-perlprov %{?with_python:BuildRequires: rpm-pythonprov} BuildRequires: zlib-devel @@ -398,6 +400,7 @@ Group: Applications/File Requires: %{name} = %{version}-%{release} Requires: popt >= %{reqpopt_ver} +Conflicts: filesystem-debuginfo < 3.0-16 %description utils Additional utilities for managing RPM packages and database. @@ -639,7 +642,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 @@ -700,6 +702,7 @@ %patch66 -p1 %patch67 -p1 %patch68 -p1 +%patch69 -p1 mv -f scripts/{perl.req,perl.req.in} mv -f scripts/{perl.prov,perl.prov.in} @@ -769,7 +772,7 @@ %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{/%{_lib},/etc/sysconfig,%{_sysconfdir}/rpm,/var/lib/banner} +install -d $RPM_BUILD_ROOT{/%{_lib},/etc/sysconfig,%{_sysconfdir}/rpm,/var/lib/banner,/var/cache/hrmib} %{__make} install \ DESTDIR=$RPM_BUILD_ROOT \ @@ -878,6 +881,7 @@ install %{SOURCE13} $RPM_BUILD_ROOT%{_rpmlibdir}/user_group.sh install %{SOURCE16} $RPM_BUILD_ROOT%{_rpmlibdir}/java-find-requires install scripts/php.{prov,req} $RPM_BUILD_ROOT%{_rpmlibdir} +install %{SOURCE5} $RPM_BUILD_ROOT%{_rpmlibdir}/hrmib-cache install %{SOURCE14} $RPM_BUILD_ROOT/etc/sysconfig/rpm install %{SOURCE17} $RPM_BUILD_ROOT%{_bindir}/banner.sh @@ -983,6 +987,8 @@ ^libxkbui.so # -- fam / gamin ^libfam.so.0 +# -- mdns-bonjour: mDNSResponder-libs / avahi-compat-libdns_sd +^libdns_sd.so.1 EOF cat > $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautocompressdoc <<EOF # global list of file masks not to be compressed in DOCDIR @@ -1044,10 +1050,14 @@ %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 +%triggerpostun -- %{name} < 4.4.9-44 +%{_rpmlibdir}/hrmib-cache + %post lib -p /sbin/ldconfig %postun lib -p /sbin/ldconfig @@ -1085,6 +1095,10 @@ %dir /var/lock/rpm /var/lock/rpm/transaction +# exported package NVRA (stamped with install tid) +# net-snmp hrSWInstalledName queries, bash-completions +%dir /var/cache/hrmib + #%attr(755,root,root) %{_rpmlibdir}/rpmd #%{!?with_static:%attr(755,root,root) %{_rpmlibdir}/rpm[eiu]} #%attr(755,root,root) %{_rpmlibdir}/rpmk @@ -1093,6 +1107,8 @@ %{_rpmlibdir}/rpmpopt* %{_rpmlibdir}/macros +%attr(755,root,root) %{_rpmlibdir}/hrmib-cache + %files base %defattr(644,root,root,755) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/rpm @@ -1103,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 @@ -1117,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) @@ -1269,6 +1293,17 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.837.4.12 2008-03-26 14:34:13 hawk +- merged from rpm-4_4_9 branch: + - add /var/cache/hrmib dir and initial fillup + - sync poldek/rpm commandline args: add --downgrade to rpm + - umask for mkdir in pretrans + - 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) + - noautoreqdep libdns_sd.so.1 + - don't hardcode python version + Revision 1.837.4.11 2008-02-16 23:11:39 hawk - release bumped to 37 to satisfy rpm-build-macros conflict (blah, such bumping sucks a lot, damn rpm->rpm-build-macros find_lang movement) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/rpm.spec?r1=1.837.4.11&r2=1.837.4.12&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
