[packages/rpm/dev-5.4.16] update trivial patches

[glen]

commit 76788d37d6082c768d7bc49354226d5b7c844e1d
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Wed Mar 16 17:18:47 2016 +0200

    update trivial patches

 rpm-5.4.4-pass-_builddir-properly-to-find-debuginfo.patch |  8 ++++----
 rpm-5.4.8-dont-show-suggests-with-requires.patch          | 11 ++++++-----
 rpm-5.4.9-keep-loading-script-macros.patch                | 15 +++++----------
 rpm.spec                                                  |  4 ++--
 4 files changed, 17 insertions(+), 21 deletions(-)
---
diff --git a/rpm.spec b/rpm.spec
index fa1ced1..d461a99 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -971,7 +971,7 @@ cd -
 
 %patch1000 -p1
 %patch1001 -p1
-%patch1002 -p1
+#%patch1002 -p1 REDIFF
 %patch1003 -p1
 %patch1004 -p1
 %patch1005 -p1
@@ -979,7 +979,7 @@ cd -
 %patch1007 -p1
 %patch1008 -p1
 %patch1009 -p1
-%patch1010 -p1
+#%patch1010 -p1 REDIFF
 %patch1011 -p1
 %patch1012 -p1
 %patch1013 -p1
diff --git a/rpm-5.4.4-pass-_builddir-properly-to-find-debuginfo.patch b/rpm-5.4.4-pass-_builddir-properly-to-find-debuginfo.patch
index 9dd9a29..8b2926f 100644
--- a/rpm-5.4.4-pass-_builddir-properly-to-find-debuginfo.patch
+++ b/rpm-5.4.4-pass-_builddir-properly-to-find-debuginfo.patch
@@ -13,13 +13,13 @@ macros.rpmbuild fixed with rpm-fix-___build_pre-macro.patch
 #   %{?buildroot:RPM_BUILD_ROOT=\"%{u2p:%{buildroot}}\"\
 #   export RPM_BUILD_ROOT}\
 #   %{?_javaclasspath:CLASSPATH=\"%{_javaclasspath}\"\
---- rpm-5.4.4/scripts/find-debuginfo.sh.builddir~	2011-12-20 15:36:31.962846125 +0100
-+++ rpm-5.4.4/scripts/find-debuginfo.sh	2011-12-20 15:36:49.492836503 +0100
-@@ -32,7 +32,6 @@ strip_r=false
+--- rpm-5.4.16/scripts/find-debuginfo.sh~	2016-03-16 17:17:59.000000000 +0200
++++ rpm-5.4.16/scripts/find-debuginfo.sh	2016-03-16 17:18:58.327652453 +0200
+@@ -28,7 +28,6 @@
  # Barf on missing build IDs.
  strict=false
  
--RPM_BUILD_DIR="`pwd`"
+-RPM_BUILD_DIR="$(pwd)"
  # canon RPM_BUILD_DIR, the DW_AT_comp_dir in ELF objects is real a real path
  # and debugedit will ignore them as they are out of build dir.
  RPM_BUILD_DIR=$(readlink -f "$RPM_BUILD_DIR")
diff --git a/rpm-5.4.8-dont-show-suggests-with-requires.patch b/rpm-5.4.8-dont-show-suggests-with-requires.patch
index 19cf1e0..7276020 100644
--- a/rpm-5.4.8-dont-show-suggests-with-requires.patch
+++ b/rpm-5.4.8-dont-show-suggests-with-requires.patch
@@ -1,5 +1,5 @@
---- rpm-5.4.8/rpmdb/hdrfmt.c.suggests~	2012-04-25 17:58:22.721144146 +0200
-+++ rpm-5.4.8/rpmdb/hdrfmt.c	2012-04-25 18:33:32.293704707 +0200
+--- rpm-5.4.16/rpmdb/hdrfmt.c~	2016-03-16 17:16:18.000000000 +0200
++++ rpm-5.4.16/rpmdb/hdrfmt.c	2016-03-16 17:17:06.301851778 +0200
 @@ -1607,6 +1607,38 @@ static const char * bfstring(unsigned in
  #endif
  
@@ -39,15 +39,16 @@
   * Retrieve install prefixes.
   * @param h		header
   * @retval *he		tag container
-@@ -5201,6 +5233,8 @@ static struct headerSprintfExtension_s _
- 	{ .fmtFunction = digestFormat } },
-     { HEADER_EXT_FORMAT, "fflags",
+@@ -5583,6 +5583,8 @@
  	{ .fmtFunction = fflagsFormat } },
+     { HEADER_EXT_FORMAT, "fstate",
+ 	{ .fmtFunction = fstateFormat } },
 +    { HEADER_EXT_FORMAT, "hint",
 +	{ .fmtFunction = hintFormat } },
      { HEADER_EXT_FORMAT, "iconv",
  	{ .fmtFunction = iconvFormat } },
      { HEADER_EXT_FORMAT, "json",
+     { HEADER_EXT_FORMAT, "json",
 --- rpm-5.4.8/rpmpopt.in.suggests~	2012-04-25 17:58:22.439141788 +0200
 +++ rpm-5.4.8/rpmpopt.in	2012-04-25 18:33:32.295704719 +0200
 @@ -98,7 +98,8 @@ rpm	alias --provides	--qf \
diff --git a/rpm-5.4.9-keep-loading-script-macros.patch b/rpm-5.4.9-keep-loading-script-macros.patch
index a9d23f9..393c16a 100644
--- a/rpm-5.4.9-keep-loading-script-macros.patch
+++ b/rpm-5.4.9-keep-loading-script-macros.patch
@@ -1,11 +1,6 @@
---- rpm-5.4.9/macros/macros.in.script_macros~	2012-05-07 00:36:51.000000000 +0200
-+++ rpm-5.4.9/macros/macros.in	2012-05-15 01:39:37.382649841 +0200
-@@ -993,63 +993,63 @@ $_arbitrary_tags_tests	Foo:Bar
- # XXX	%{load:...}, then loading will CEASE at that point in the file.
- #==============================================================================
- # ---- SELinux configuration macros.
--#%%{load:%{_usrlibrpm}/macros.d/selinux}
-+%{load:%{_usrlibrpm}/macros.d/selinux}
+--- rpm-5.4.16/macros/macros.in~	2016-03-16 17:20:06.000000000 +0200
++++ rpm-5.4.16/macros/macros.in	2016-03-16 17:21:36.845860496 +0200
+@@ -1050,15 +1050,15 @@
  
  #==============================================================================
  # ---- rpmbuild macros.
@@ -24,7 +19,7 @@
  
  #------------------------------------------------------------------------
  # haskell(...) configuration.
- #%%{load:%{_usrlibrpm}/macros.d/haskell}
+@@ -1066,43 +1066,43 @@
  
  #------------------------------------------------------------------------
  # perl(...) configuration
@@ -74,7 +69,7 @@
  #------------------------------------------------------------------------
  # typelib(...) configuration.
 -#%%{load:%{_usrlibrpm}/macros.d/typelib}
-+#%%{load:%{_usrlibrpm}/macros.d/typelib}
++%{load:%{_usrlibrpm}/macros.d/typelib}
  
  # \endverbatim
  #*/
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/6a66bc249043bebf24d1d7c1254ef126b1c14707