From 22708ed884afec96e3ce02eac2543286704003b7 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Elan=20Ruusam=C3=A4e?= <glen@delfi.ee>
Date: Wed, 16 Mar 2016 00:40:14 +0200
Subject: [PATCH] few more trivial patch updates

---
 rpm-5.4.15-use-DSA-sig.patch             |  6 +++---
 rpm-5.4.4-pkgconfigdeps-check-path.patch |  4 ++--
 rpm-file-output-for-ELF.patch            | 23 ++++++++++-------------
 rpm.spec                                 |  2 +-
 4 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/rpm-5.4.15-use-DSA-sig.patch b/rpm-5.4.15-use-DSA-sig.patch
index e6d9799..89296a5 100644
--- a/rpm-5.4.15-use-DSA-sig.patch
+++ b/rpm-5.4.15-use-DSA-sig.patch
@@ -1,10 +1,10 @@
---- rpm-5.4.15/macros/macros.rpmbuild.in~	2014-11-15 19:23:32.000000000 +0100
-+++ rpm-5.4.15/macros/macros.rpmbuild.in	2014-11-15 19:24:15.545692422 +0100
+--- rpm-5.4.16/macros/macros.rpmbuild.in~	2016-03-16 00:35:33.000000000 +0200
++++ rpm-5.4.16/macros/macros.rpmbuild.in	2016-03-16 00:36:00.832131027 +0200
 @@ -282,7 +282,7 @@
  # 	ECDSA/SHA384	(using NIST P-384)
  # 	ECDSA/SHA512	(using NIST P-521)
  #
--%_build_sign	RSA/SHA1
+-%_build_sign	ECDSA/SHA256
 +%_build_sign	DSA
  
  #
diff --git a/rpm-5.4.4-pkgconfigdeps-check-path.patch b/rpm-5.4.4-pkgconfigdeps-check-path.patch
index 5309292..de33276 100644
--- a/rpm-5.4.4-pkgconfigdeps-check-path.patch
+++ b/rpm-5.4.4-pkgconfigdeps-check-path.patch
@@ -5,7 +5,7 @@
      case "${filename}" in
      *.pc)
 -	# Query the dependencies of the package.
--	DIR=`dirname ${filename}`
+-	DIR=$(dirname ${filename})
 -	PKG_CONFIG_PATH="$DIR:$DIR/../../share/pkgconfig"
 -	export PKG_CONFIG_PATH
 -	$pkgconfig --print-provides "$filename" 2> /dev/null | while read n r v ; do
@@ -20,7 +20,7 @@
 -	done
 +	if [[ "$(dirname ${filename})" =~ pkgconfig ]]; then
 +	    # Query the dependencies of the package.
-+	    DIR=`dirname ${filename}`
++	    DIR=$(dirname ${filename})
 +	    PKG_CONFIG_PATH="$DIR:$DIR/../../share/pkgconfig"
 +	    export PKG_CONFIG_PATH
 +	    $pkgconfig --print-provides "$filename" 2> /dev/null | while read n r v ; do
diff --git a/rpm-file-output-for-ELF.patch b/rpm-file-output-for-ELF.patch
index ea01b4a..28b3390 100644
--- a/rpm-file-output-for-ELF.patch
+++ b/rpm-file-output-for-ELF.patch
@@ -1,26 +1,23 @@
-diff -dur -x '*~' rpm-5.4.15.orig/scripts/brp-strip rpm-5.4.15/scripts/brp-strip
---- rpm-5.4.15.orig/scripts/brp-strip	2011-09-06 14:53:10.000000000 +0200
-+++ rpm-5.4.15/scripts/brp-strip	2015-01-27 11:09:22.000000000 +0100
+--- rpm-5.4.16/scripts/brp-strip~	2015-04-20 19:42:36.000000000 +0300
++++ rpm-5.4.16/scripts/brp-strip	2016-03-16 00:37:07.912263999 +0200
 @@ -16,6 +16,6 @@
- for f in `find "$RPM_BUILD_ROOT" -type f \( -perm -0100 -or -perm -0010 -or -perm -0001 \) -exec file {} \; | \
+ for f in $(find "$RPM_BUILD_ROOT" -type f \( -perm -0100 -or -perm -0010 -or -perm -0001 \) -exec file {} \; | \
          grep -v "^${RPM_BUILD_ROOT}/\?usr/lib/debug"  | \
  	grep -v ' shared object,' | \
--	sed -n -e 's/^\(.*\):[ 	]*ELF.*, not stripped/\1/p'`; do
-+	sed -n -e 's/^\(.*\):[ 	]*ELF.*, not stripped.*/\1/p'`; do
+-	sed -n -e 's/^\(.*\):[ 	]*ELF.*, not stripped/\1/p'); do
++	sed -n -e 's/^\(.*\):[ 	]*ELF.*, not stripped.*/\1/p'); do
  	$STRIP -g "$f" || :
  done
-diff -dur -x '*~' rpm-5.4.15.orig/scripts/brp-strip-shared rpm-5.4.15/scripts/brp-strip-shared
---- rpm-5.4.15.orig/scripts/brp-strip-shared	2012-05-08 05:00:44.000000000 +0200
-+++ rpm-5.4.15/scripts/brp-strip-shared	2015-01-27 11:09:41.000000000 +0100
+--- rpm-5.4.16/scripts/brp-strip-shared~	2015-04-20 19:42:36.000000000 +0300
++++ rpm-5.4.16/scripts/brp-strip-shared	2016-03-16 00:37:21.346291524 +0200
 @@ -21,6 +21,6 @@
- for f in `find "$RPM_BUILD_ROOT" -type f -a -exec file {} \; | \
+ for f in $(find "$RPM_BUILD_ROOT" -type f -a -exec file {} \; | \
          grep -v "^${RPM_BUILD_ROOT}/\?usr/lib/debug"  | \
  	grep ' shared object,' | \
--	sed -n -e 's/^\(.*\):[ 	]*ELF.*, not stripped/\1/p'`; do
-+	sed -n -e 's/^\(.*\):[ 	]*ELF.*, not stripped.*/\1/p'`; do
+-	sed -n -e 's/^\(.*\):[ 	]*ELF.*, not stripped/\1/p'); do
++	sed -n -e 's/^\(.*\):[ 	]*ELF.*, not stripped.*/\1/p'); do
  	$STRIP --strip-unneeded "$f"
  done
-diff -dur -x '*~' rpm-5.4.15.orig/scripts/find-debuginfo.sh rpm-5.4.15/scripts/find-debuginfo.sh
 --- rpm-5.4.15.orig/scripts/find-debuginfo.sh	2015-01-27 11:10:52.000000000 +0100
 +++ rpm-5.4.15/scripts/find-debuginfo.sh	2015-01-27 11:09:54.000000000 +0100
 @@ -194,7 +194,7 @@
diff --git a/rpm.spec b/rpm.spec
index 86d26ec..fa1ced1 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -967,7 +967,7 @@ cd -
 %patch88 -p1
 %patch89 -p1
 %patch90 -p1
-%patch91 -p1
+#%patch91 -p1 REDIFF
 
 %patch1000 -p1
 %patch1001 -p1
-- 
2.44.0