Hello community, here is the log from the commit of package rpm for openSUSE:Factory checked in at 2017-11-03 16:20:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rpm (Old) and /work/SRC/openSUSE:Factory/.rpm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rpm" Fri Nov 3 16:20:58 2017 rev:250 rq:537210 version:4.13.0.1 Changes: -------- rpm-python.changes: same change --- /work/SRC/openSUSE:Factory/rpm/rpm.changes 2017-10-18 10:43:26.424715578 +0200 +++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2017-11-03 16:21:03.836478948 +0100 @@ -1,0 +2,14 @@ +Thu Oct 26 12:10:16 UTC 2017 - [email protected] + +- Remove usr-lib-rpmdb.patch +- Add usr-lib-sysimage-rpm.patch to locate rpmdb to + /usr/lib/sysimage/rpm after discussions with upstream +- Migrates existing rpmdb in /var/lib/rpm to /usr/lib/sysimage/rpm + +------------------------------------------------------------------- +Thu Oct 5 13:28:53 UTC 2017 - [email protected] + +- Add usr-lib-rpmdb.patch to locate rpmdb to /usr/lib/rpmdb +- Migrates existing rpmdb in /var/lib/rpm to /usr/lib/rpmdb + +------------------------------------------------------------------- New: ---- usr-lib-sysimage-rpm.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ rpm-python.spec: same change ++++++ rpm.spec ++++++ --- /var/tmp/diff_new_pack.mZddlY/_old 2017-11-03 16:21:07.456347200 +0100 +++ /var/tmp/diff_new_pack.mZddlY/_new 2017-11-03 16:21:07.460347054 +0100 @@ -63,6 +63,7 @@ Patch2: db.diff Patch3: rpm-4.12.0.1-fix-bashisms.patch Patch4: beecrypt-4.1.2-build.diff +Patch5: usr-lib-sysimage-rpm.patch # quilt patches start here Patch11: debugedit.diff Patch13: ignore-auxv.diff @@ -228,6 +229,7 @@ %patch -P 1 %patch3 -p1 %patch -P 4 +%patch5 -p1 %patch -P 11 -P 12 -P 13 -P 14 -P 15 -P 16 -P 17 -P 18 -P 19 %patch -P 20 -P 21 -P 24 -P 25 -P 26 -P 27 -P 28 -P 29 %patch -P 30 -P 31 -P 32 -P 33 -P 34 -P 35 -P 36 -P 37 -P 38 @@ -326,6 +328,7 @@ mkdir %{buildroot}/usr/src/packages/RPMS/$dd chmod 755 %{buildroot}/usr/src/packages/RPMS/$dd done +mkdir -p %{buildroot}/usr/lib/sysimage/rpm mkdir -p %{buildroot}/var/lib/rpm gzip -9 %{buildroot}/%{_mandir}/man[18]/*.[18] export RPM_BUILD_ROOT @@ -380,15 +383,41 @@ %post %{fillup_only -an services} -test -f var/lib/rpm/Packages || rpmdb --initdb -if test -s var/lib/rpm/packages.rpm ; then + +# var/lib/rpm migration: set forwards compatible symlink for /usr/lib/sysimage/rpm so scriptlets in same transaction will still work +if (test ! -L var/lib/rpm) && (test -f var/lib/rpm/Packages) ; then + rmdir usr/lib/sysimage/rpm + ln -s ../../var/lib/rpm usr/lib/sysimage/rpm +fi + +test -f usr/lib/sysimage/rpm/Packages || rpmdb --initdb + +%posttrans +# var/lib/rpm migration +if test ! -L var/lib/rpm ; then + if test -s var/lib/rpm/packages.rpm ; then echo "converting rpm-3 database to rpm-4 format..." usr/lib/rpm/convertdb1 var/lib/rpm/packages.rpm mv -f var/lib/rpm/packages.rpm var/lib/rpm/packages.rpm3 rm -f var/lib/rpm/conflictsindex.rpm var/lib/rpm/fileindex.rpm var/lib/rpm/groupindex.rpm var/lib/rpm/nameindex.rpm var/lib/rpm/providesindex.rpm var/lib/rpm/requiredby.rpm var/lib/rpm/triggerindex.rpm + fi + # delete no longer maintained databases + rm -f var/lib/rpm/Filemd5s var/lib/rpm/Filedigests var/lib/rpm/Requireversion var/lib/rpm/Provideversion + + if test -f var/lib/rpm/Packages ; then + echo "migrating rpmdb from /var/lib/rpm to /usr/lib/sysimage/rpm..." + + # remove forwards compatible symlink + if test -L usr/lib/sysimage/rpm ; then + rm -f usr/lib/sysimage/rpm + mkdir -p usr/lib/sysimage/rpm + fi + + mv -f var/lib/rpm/.[!.]* usr/lib/sysimage/rpm/ + mv -f var/lib/rpm/* usr/lib/sysimage/rpm/ + fi + rmdir var/lib/rpm && ln -s ../../usr/lib/sysimage/rpm var/lib/rpm fi -# delete no longer maintained databases -rm -f var/lib/rpm/Filemd5s var/lib/rpm/Filedigests var/lib/rpm/Requireversion var/lib/rpm/Provideversion %files -f rpm.lang %defattr(-,root,root) @@ -408,6 +437,8 @@ %{_libdir}/librpmio.so.* %{_libdir}/librpmsign.so.* %doc %{_mandir}/man[18]/*.[18]* +%dir /usr/lib/sysimage +%dir /usr/lib/sysimage/rpm %dir /var/lib/rpm %dir %attr(755,root,root) /usr/src/packages/BUILD %dir %attr(755,root,root) /usr/src/packages/SPECS ++++++ usr-lib-sysimage-rpm.patch ++++++ --- rpm-4.13.0.1/macros.in.orig 2017-10-04 17:05:17.198681581 +0200 +++ rpm-4.13.0.1/macros.in 2017-10-04 17:07:37.122679969 +0200 @@ -165,7 +165,7 @@ %_bzip2bin %{__bzip2} # The location of the rpm database file(s). -%_dbpath %{_var}/lib/rpm +%_dbpath %{_usr}/lib/sysimage/rpm # The location of the rpm database file(s) after "rpm --rebuilddb". %_dbpath_rebuild %{_dbpath}
