From d185d4c6cf9b5dc9f49f6f566d7f1428f0737f7f Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 23 Nov 2009 23:15:49 +0000 Subject: [PATCH] - Change configure macro to use _configure to allow override (bug #489942) --- redhat-rpm-config-9.0.3-configure.patch | 16 ++++++++++++++++ redhat-rpm-config.spec | 7 ++++++- 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 redhat-rpm-config-9.0.3-configure.patch diff --git a/redhat-rpm-config-9.0.3-configure.patch b/redhat-rpm-config-9.0.3-configure.patch new file mode 100644 index 0000000..c158cb9 --- /dev/null +++ b/redhat-rpm-config-9.0.3-configure.patch @@ -0,0 +1,16 @@ +--- redhat-rpm-config-9.0.3/macros.configure 2008-05-06 17:08:20.000000000 -0600 ++++ redhat-rpm-config-9.0.3/macros 2009-11-23 16:08:26.823551835 -0700 +@@ -27,11 +27,12 @@ + #============================================================================== + # ---- configure and makeinstall. + # ++%_configure ./configure + %configure \ + CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \ + CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \ + FFLAGS="${FFLAGS:-%optflags -I%_fmoddir}" ; export FFLAGS ; \ +- ./configure --build=%{_build} --host=%{_host} \\\ ++ %{_configure} --build=%{_build} --host=%{_host} \\\ + --target=%{_target_platform} \\\ + --program-prefix=%{?_program_prefix} \\\ + --prefix=%{_prefix} \\\ diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec index 3bfd369..5f5d615 100644 --- a/redhat-rpm-config.spec +++ b/redhat-rpm-config.spec @@ -1,7 +1,7 @@ Summary: Red Hat specific rpm configuration files Name: redhat-rpm-config Version: 9.0.3 -Release: 18%{?dist} +Release: 19%{?dist} # No version specified. License: GPL+ Group: Development/System @@ -16,6 +16,7 @@ Patch6: redhat-rpm-config-9.0.3-xz-payload.patch Patch7: redhat-rpm-config-9.0.3-jars-with-spaces.patch Patch8: redhat-rpm-config-9.0.3-brpssa-speedup.patch Patch9: redhat-rpm-config-9.0.3-filtering-macros.patch +Patch10: redhat-rpm-config-9.0.3-configure.patch BuildArch: noarch Requires: mktemp BuildRoot: %{_tmppath}/%{name}-root @@ -35,6 +36,7 @@ Red Hat specific rpm configuration files. %patch7 -p5 %patch8 -p1 %patch9 -p1 +%patch10 -p1 %build @@ -50,6 +52,9 @@ rm -rf ${RPM_BUILD_ROOT} %{_prefix}/lib/rpm/redhat %changelog +* Mon Nov 23 2009 Orion Poplawski - 9.0.3-19 +- Change configure macro to use _configure to allow override (bug #489942) + * Mon Sep 28 2009 Bill Nottingham - Drop xz compression level to 2