From a91c848b8a929e71b77cf448ab219051e6af2efb Mon Sep 17 00:00:00 2001
From: Florian Festi <ffesti@redhat.com>
Date: May 29 2015 14:54:33 +0000
Subject: - Support out of source builds for %_configure_gnuconfig_hack (#1191788)

- Fix typo in %kernel_module_package (#1159361)

---

diff --git a/macros b/macros
index 49f3ba4..67fee38 100644
--- a/macros
+++ b/macros
@@ -32,7 +32,7 @@
   FFLAGS="${FFLAGS:-%optflags -I%_fmoddir}" ; export FFLAGS ; \
   FCFLAGS="${FCFLAGS:-%optflags -I%_fmoddir}" ; export FCFLAGS ; \
   LDFLAGS="${LDFLAGS:-%__global_ldflags}"; export LDFLAGS; \
-  [ "%_configure_gnuconfig_hack" = 1 ] && for i in $(find . -name config.guess -o -name config.sub) ; do \
+  [ "%_configure_gnuconfig_hack" = 1 ] && for i in $(find $(dirname %{_configure}) -name config.guess -o -name config.sub) ; do \
       [ -f /usr/lib/rpm/redhat/$(basename $i) ] && %{__rm} -f $i && %{__cp} -fv /usr/lib/rpm/redhat/$(basename $i) $i ; \
   done ; \
   [ "%_configure_libtool_hardening_hack" = 1 ] && [ x != "x%{_hardened_ldflags}" ] && \
diff --git a/macros.kmp b/macros.kmp
index 25a129f..1c35a91 100644
--- a/macros.kmp
+++ b/macros.kmp
@@ -58,5 +58,5 @@ kernel_module_package_release	1
 	then \
 		nobuildreqs="yes" \
 	fi \
-	kmp_override_filelist="$filelist" kmp_override_preamble="$preamble" kmp_nobuildreqs="$buildreqs" %{kmodtool} rpmtemplate_kmp %{-n*}%{!-n:%name} %{kverrel} $flavors_to_build 2>/dev/null \
+	kmp_override_filelist="$filelist" kmp_override_preamble="$preamble" kmp_nobuildreqs="$nobuildreqs" %{kmodtool} rpmtemplate_kmp %{-n*}%{!-n:%name} %{kverrel} $flavors_to_build 2>/dev/null \
 )}
diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec
index 0884151..a317f55 100644
--- a/redhat-rpm-config.spec
+++ b/redhat-rpm-config.spec
@@ -6,7 +6,7 @@
 
 Summary: Red Hat specific rpm configuration files
 Name: redhat-rpm-config
-Version: 31
+Version: 32
 Release: 1%{?dist}
 # No version specified.
 License: GPL+
@@ -135,6 +135,10 @@ install -p -m 755 -t %{buildroot}%{_rpmconfigdir} kmod.prov
 %{_rpmconfigdir}/macros.d/macros.kmp
 
 %changelog
+* Fri May 29 2015 Florian Festi <ffesti@redhat.com> 32-1
+- Support out of source builds for %_configure_gnuconfig_hack (#1191788)
+- Fix typo in %kernel_module_package (#1159361)
+    
 * Tue May 19 2015 Florian Festi <ffesti@redhat.com> 31-1
 - Add %py_auto_byte_compile macro controlling Python bytecompilation
 (#976651)