changes et al

OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=396

changes-doc.diff

@@ -0,0 +1,21 @@
+--- ./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

macrosin.diff

@@ -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 @@ Index: macros.in
  #
  #%_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.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Wed Jul  5 16:28:46 CEST 2017 - ngompa13@gmail.com
+
+- 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
+
 -------------------------------------------------------------------
 Fri Jun  9 15:33:01 UTC 2017 - sriedel@suse.com
 

rpm.spec

@@ -146,6 +146,7 @@ Patch101:       nobfd.diff
 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
 #
@@ -241,7 +242,7 @@ rm -f rpmdb/db.h
 %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 +290,7 @@ export PYTHON=python%{with_python}
 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 \

rpmpopt.diff

@@ -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"
+