From cd5025c1b6dd4713b99ee55f8480f0262b885d91262c0f2918233ba6781d8570 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Schr=C3=B6der?= <mls@suse.com>
Date: Fri, 9 May 2014 11:38:53 +0000
Subject: [PATCH] - fix macro adjusting in installplatform

OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=330
---
 gentlyadjustmacros.diff | 25 +++++++++++++++++++++++++
 rpm.changes             |  7 +++++++
 rpm.spec                |  3 ++-
 3 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 gentlyadjustmacros.diff

diff --git a/gentlyadjustmacros.diff b/gentlyadjustmacros.diff
new file mode 100644
index 0000000..b85c9e8
--- /dev/null
+++ b/gentlyadjustmacros.diff
@@ -0,0 +1,25 @@
+commit 46993cd3846a8c8935c980e30bbc3718338e2378
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date:   Fri May 9 10:56:46 2014 +0300
+
+    Sometimes a smaller hammer is better (but only sometimes)
+    
+    - The sed-munger added in commit ccd6281e699781e0b00edb16b6e9f4dec6878c15
+      causes bigger breakage than it fixes, perhaps because the hammer
+      applied was disproportionally large. The only thing needing adjustment
+      is ${prefix} in case when localstatedir is not explicitly set, so
+      we fixup just that instead of "everything".
+    - Discovered via RhBug:921973 testing
+
+diff --git a/installplatform b/installplatform
+index ffaef48..98b87f3 100755
+--- installplatform.orig
++++ installplatform
+@@ -154,5 +154,5 @@ for ARCH in noarch `grep ^arch_canon $RPMRC | cut -d: -f2`; do
+ 
+ done
+ 
+-# gently adjust autoconf variables to rpm macros...
+-cat $MACROS | sed -e '/\${\w*:-/!s,\${,%{_,' > ${DESTDIR}/${pkglibdir}/macros
++# gently adjust undefined autoconf variables to rpm macros...
++cat $MACROS | sed -e 's,${prefix},%{_prefix},g' > ${DESTDIR}/${pkglibdir}/macros
diff --git a/rpm.changes b/rpm.changes
index 41e9b76..89fc8c4 100644
--- a/rpm.changes
+++ b/rpm.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri May  9 13:33:09 CEST 2014 - mls@suse.de
+
+- fix macro adjusting in installplatform
+  the old code broke macos like GNUconfigure [bnc#874897]
+  new patch: gentlyadjustmacros.diff
+
 -------------------------------------------------------------------
 Fri Apr 25 15:41:57 CEST 2014 - mls@suse.de
 
diff --git a/rpm.spec b/rpm.spec
index 0e15e1f..6ab7415 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -138,6 +138,7 @@ Patch93:        weakdepscompat.diff
 Patch94:        checksepwarn.diff
 Patch95:        exportoldtags.diff
 Patch96:        rundir.diff
+Patch97:        gentlyadjustmacros.diff
 Patch6464:      auto-config-update-aarch64-ppc64le.diff
 Patch68000:     m68k.patch
 Patch68001:     debugedit-m68k.patch
@@ -227,7 +228,7 @@ rm -f rpmdb/db.h
 %patch -P 60 -P 61 -P 62 -P 63 -P 64 -P 65 -P 66 -P 67 -P 68 -P 69
 %patch -P 70 -P 71 -P 72 -P 73 -P 74 -P 75 -P 76 -P 77 -P 78 -P 79
 %patch -P 80       -P 82             -P 85                  
-%patch             -P 92 -P 93 -P 94 -P 95 -P 96
+%patch             -P 92 -P 93 -P 94 -P 95 -P 96 -P 97
 
 %ifarch aarch64 ppc64le
 %patch6464