Hello community, here is the log from the commit of package rpm for openSUSE:Factory checked in at 2017-08-04 11:56:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rpm (Old) and /work/SRC/openSUSE:Factory/.rpm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rpm" Fri Aug 4 11:56:28 2017 rev:247 rq:512653 version:4.13.0.1 Changes: -------- rpm-python.changes: same change --- /work/SRC/openSUSE:Factory/rpm/rpm.changes 2017-06-18 13:48:28.950927105 +0200 +++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2017-08-04 11:56:30.859896848 +0200 @@ -1,0 +2,46 @@ +Wed Jul 26 12:39:40 UTC 2017 - [email protected] + +- Amend finddebuginfo.diff to adjust readelf -Wn pattern matching + to account for fixed readelf no longer emitting spurious newlines + with -W. + +------------------------------------------------------------------- +Mon Jul 10 12:03:08 UTC 2017 - [email protected] + +- Drop net-tools Requires from rpm-build: net-tools only ships + uninteresting binaries. Most people would probably rather have + net-tools-depreacted expected (e.g. ifconfig), but as we did not + pull this in neither, we can just ignore this. + +------------------------------------------------------------------- +Wed Jul 5 16:28:46 CEST 2017 - [email protected] + +- Define %_sharedstatedir as /var/lib, which is the path for + shared state content in Red Hat/Fedora; Mageia; and Debian/Ubuntu. + The old path (/usr/com) isn't recognized by FHS, whereas /var/lib + is recognized as suitable for this purpose. +- Change the RPM binary payload from old-lzma to xz, + in line with payload settings for RH/Fedora and Mageia +- Backport upstream commit to read changelog entries with full + timestamps + New patch: changes-doc.diff + +------------------------------------------------------------------- +Thu Jun 15 07:08:45 UTC 2017 - [email protected] + +- Added a %rpm_vercmp macro which accepts two versions as parameters and + returns -1, 0, 1 if the first version is less than, equal or + greater than the second version respectively. +- Added a %pkg_version macro that accepts a package or capability name + as argument and returns the version number of the installed package. If + no package provides the argument, it returns the string ~~~ +- Added a %pkg_vcmp macro that accepts 3 parameters. The first parameter + is a package name or provided capability name, the second argument is an + operator ( < <= = >= > != ) and the third parameter is a version string + to compare the installed version of the first argument with. +- Added a %pkg_version_cmp macro which accepts a package or capability name + as first argument and a version number as second argument and returns + -1, 0, 1 or ~~~ . The number values have the same meaning as in %rpm_vercmp + and the ~~~ string is returned if the package or capability can't be found. + +------------------------------------------------------------------- New: ---- changes-doc.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ rpm-python.spec: same change ++++++ rpm.spec ++++++ --- /var/tmp/diff_new_pack.6cQ0aZ/_old 2017-08-04 11:56:34.311409685 +0200 +++ /var/tmp/diff_new_pack.6cQ0aZ/_new 2017-08-04 11:56:34.319408556 +0200 @@ -146,6 +146,7 @@ Patch102: emptymanifest.diff Patch103: find-lang-qt-qm.patch Patch104: perlprov-package.diff +Patch105: changes-doc.diff Patch6464: auto-config-update-aarch64-ppc64le.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build # @@ -199,7 +200,6 @@ Requires: grep Requires: gzip Requires: make -Requires: net-tools Requires: patch Requires: perl-base Requires: sed @@ -241,7 +241,7 @@ %patch -P 70 -P 71 -P 73 -P 74 -P 75 -P 76 -P 77 -P 78 -P 79 %patch -P 80 -P 81 -P 82 -P 83 -P 85 %patch -P 92 -P 93 -P 94 -P 96 -P 98 -P 99 -%patch -P 100 -P 101 -P 102 -P 103 -P 104 +%patch -P 100 -P 101 -P 102 -P 103 -P 104 -P 105 %ifarch aarch64 ppc64le %patch6464 @@ -289,7 +289,7 @@ autoreconf -fi sed -i -e 's,{PYTHON_VERSION}mu,{PYTHON_VERSION}mu python${PYTHON_VERSION}m,' configure ./configure --disable-dependency-tracking --prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir} \ ---libdir=%{_libdir} --sysconfdir=/etc --localstatedir=/var --with-lua \ +--libdir=%{_libdir} --sysconfdir=/etc --localstatedir=/var --sharedstatedir=/var/lib --with-lua \ --with-vendor=suse \ --with-rundir=/run \ --without-archive \ ++++++ changes-doc.diff ++++++ --- ./doc/rpm.8.orig 2017-07-05 14:31:21.186733161 +0000 +++ ./doc/rpm.8 2017-07-05 14:32:12.097733071 +0000 @@ -65,7 +65,7 @@ rpm \- RPM Package Manager .PP - [\fB--changelog\fR] [\fB-c,--configfiles\fR] [\fB--conflicts\fR] + [\fB--changelog\fR] [\fB--changes\fR] [\fB-c,--configfiles\fR] [\fB--conflicts\fR] [\fB-d,--docfiles\fR] [\fB--dump\fR] [\fB--enhances\fR] [\fB--filesbypkg\fR] [\fB-i,--info\fR] [\fB--last\fR] [\fB-l,--list\fR] [\fB--obsoletes\fR] [\fB--provides\fR] [\fB--qf,--queryformat \fIQUERYFMT\fB\fR] @@ -615,6 +615,9 @@ Query all packages that enhance \fICAPAB \fB--changelog\fR Display change information for the package. .TP +\fB--changes\fR +Display change information for the package with full time stamps. +.TP \fB-c, --configfiles\fR List only configuration files (implies \fB-l\fR). .TP ++++++ finddebuginfo.diff ++++++ --- /var/tmp/diff_new_pack.6cQ0aZ/_old 2017-08-04 11:56:34.815338558 +0200 +++ /var/tmp/diff_new_pack.6cQ0aZ/_new 2017-08-04 11:56:34.815338558 +0200 @@ -1,5 +1,7 @@ ---- ./scripts/find-debuginfo.sh.orig 2016-11-03 09:10:28.922784796 +0000 -+++ ./scripts/find-debuginfo.sh 2017-01-19 12:32:12.596821861 +0000 +Index: scripts/find-debuginfo.sh +=================================================================== +--- scripts/find-debuginfo.sh.orig 2017-02-16 10:54:14.779025209 +0100 ++++ scripts/find-debuginfo.sh 2017-07-26 14:39:24.338122534 +0200 @@ -224,6 +224,20 @@ make_id_dup_link() debug_link "$file" "/$idfile" } @@ -100,6 +102,15 @@ # strip -g implies we have full symtab, don't add mini symtab in that case. $strip_g || ($include_minidebug && add_minidebug "${debugfn}" "$f") +@@ -366,7 +402,7 @@ if $run_dwz && type dwz >/dev/null 2>&1 + rmdir "${RPM_BUILD_ROOT}/usr/lib/debug/.dwz" 2>/dev/null + if [ -f "${RPM_BUILD_ROOT}/usr/lib/debug/.dwz/${dwz_multifile_name}" ]; then + id="`readelf -Wn "${RPM_BUILD_ROOT}/usr/lib/debug/.dwz/${dwz_multifile_name}" \ +- 2>/dev/null | sed -n 's/^ Build ID: \([0-9a-f]\+\)/\1/p'`" ++ 2>/dev/null | sed -n 's/^.* Build ID: \([0-9a-f]\+\)/\1/p'`" + [ -n "$id" ] \ + && make_id_link "$id" "/usr/lib/debug/.dwz/${dwz_multifile_name}" .debug + fi @@ -399,12 +435,14 @@ if [ -s "$SOURCEFILE" ]; then # stupid cpio creates new directories in mode 0700, fixup find "${RPM_BUILD_ROOT}/usr/src/debug" -type d -print0 | ++++++ macrosin.diff ++++++ --- /var/tmp/diff_new_pack.6cQ0aZ/_old 2017-08-04 11:56:34.931322188 +0200 +++ /var/tmp/diff_new_pack.6cQ0aZ/_new 2017-08-04 11:56:34.939321059 +0200 @@ -1,7 +1,5 @@ -Index: macros.in -=================================================================== ---- macros.in.orig 2017-02-16 10:40:09.908649457 +0100 -+++ macros.in 2017-03-06 13:35:44.504200409 +0100 +--- ./macros.in.orig 2017-02-16 09:40:09.908649457 +0000 ++++ ./macros.in 2017-07-05 14:15:53.855734802 +0000 @@ -185,22 +185,22 @@ # Template for debug information sub-package. @@ -43,7 +41,7 @@ # #%_source_payload w9.gzdio -#%_binary_payload w9.gzdio -+%_binary_payload w5.lzdio ++%_binary_payload w5.xzdio # Algorithm to use for generating file checksum digests on build. # If not specified or 0, MD5 is used. ++++++ rpm-suse_macros ++++++ --- /var/tmp/diff_new_pack.6cQ0aZ/_old 2017-08-04 11:56:35.315267996 +0200 +++ /var/tmp/diff_new_pack.6cQ0aZ/_new 2017-08-04 11:56:35.315267996 +0200 @@ -264,3 +264,17 @@ %description %{-n:-n %{-n*}-}lang \ Provides translations for the \"%{name}\" package. +# package version comparison macros + +# compare two versions, returns -1, 0, 1, ~~~ +%rpm_vercmp() %{lua:print(rpm.expand('%1') == '~~~' and '~~~' or rpm.vercmp(rpm.expand('%1'), rpm.expand('%2')))} + +# expand to the installed version of a package/provides +%pkg_version() %(LC_ALL=C rpm -q --whatprovides --qf "%%{version}" "%1" | sed -e "s/^no package provides .*/~~~/") + +# compare the installed version to a value. returns -1, 0, 1, ~~~ +%pkg_version_cmp() %{expand:%{expand:%%%%{rpm_vercmp %%{pkg_version %1} %%2}}} + +# convenience/readability +%pkg_vcmp() (%{expand:%%{pkg_version_cmp %1 %3}} %2 0) + ++++++ rpmpopt.diff ++++++ --- /var/tmp/diff_new_pack.6cQ0aZ/_old 2017-08-04 11:56:35.431251625 +0200 +++ /var/tmp/diff_new_pack.6cQ0aZ/_new 2017-08-04 11:56:35.431251625 +0200 @@ -1,6 +1,6 @@ ---- ./rpmpopt.in.orig 2011-05-11 14:27:32.000000000 +0000 -+++ ./rpmpopt.in 2011-05-11 15:02:34.000000000 +0000 -@@ -101,7 +101,8 @@ Relocations : %|PREFIXES?{[%{PREFIXES} ] +--- ./rpmpopt.in.orig 2017-02-16 09:40:09.969649413 +0000 ++++ ./rpmpopt.in 2017-07-05 14:13:49.599735022 +0000 +@@ -100,12 +100,16 @@ Relocations : %|PREFIXES?{[%{PREFIXES} ] %|URL?{URL : %{URL}\n}|\ %|BUGURL?{Bug URL : %{BUGURL}\n}|\ Summary : %{SUMMARY}\n\ @@ -10,3 +10,11 @@ --POPTdesc=$"list descriptive information from package(s)" rpm alias --changelog --qf '[* %{CHANGELOGTIME:day} %{CHANGELOGNAME}\n%{CHANGELOGTEXT}\n\n]' \ + --POPTdesc=$"list change logs for this package" + ++rpm alias --changes --qf '[* %{CHANGELOGTIME:date} %{CHANGELOGNAME}\n%{CHANGELOGTEXT}\n\n]' \ ++ --POPTdesc=$"list changes for this package with full time stamps" ++ + rpm alias --xml --qf '[%{*:xml}\n]' \ + --POPTdesc=$"list metadata in xml" +
