rpms/redhat-rpm-config/F-10 limit-smp-16-threads.patch, 1.1, 1.2 redhat-rpm-config-9.0.3-filtering-macros.patch, 1.1, 1.2 redhat-rpm-config.spec, 1.60, 1.61

[Paul Howarth]

Author: pghmcfc

Update of /cvs/pkgs/rpms/redhat-rpm-config/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31142

Modified Files:
	limit-smp-16-threads.patch 
	redhat-rpm-config-9.0.3-filtering-macros.patch 
	redhat-rpm-config.spec 
Log Message:
* Thu Sep 03 2009 Paul Howarth <paul at city-fan.org> 9.0.3-7
- limit-smp-16-threads.patch: Rediff so we don't ship a .orig file (#500316)
- actually apply the filtering macros patch
- redhat-rpm-config-9.0.3-filtering-macros.patch: Rediff so we don't ship a .orig file
- add (empty) %build section
- fix unescaped macros in changelog


limit-smp-16-threads.patch:
 macros |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Index: limit-smp-16-threads.patch
===================================================================
RCS file: /cvs/pkgs/rpms/redhat-rpm-config/F-10/limit-smp-16-threads.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- limit-smp-16-threads.patch	16 Feb 2009 17:02:51 -0000	1.1
+++ limit-smp-16-threads.patch	3 Sep 2009 09:47:06 -0000	1.2
@@ -1,7 +1,7 @@
-diff -Nur redhat-rpm-config-9.0.2-orig/macros redhat-rpm-config-9.0.2/macros
---- redhat-rpm-config-9.0.2-orig/macros	2008-04-03 02:14:54.000000000 -0500
-+++ redhat-rpm-config-9.0.2/macros	2008-05-20 13:33:15.000000000 -0500
-@@ -68,7 +68,8 @@
+diff -up redhat-rpm-config-9.0.3/macros.orig redhat-rpm-config-9.0.3/macros
+--- redhat-rpm-config-9.0.3/macros.orig	2008-05-06 19:08:20.000000000 -0400
++++ redhat-rpm-config-9.0.3/macros	2009-06-03 15:00:28.000000000 -0400
+@@ -67,7 +67,8 @@
  
  %_smp_mflags %([ -z "$RPM_BUILD_NCPUS" ] \\\
  	&& RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"; \\\

redhat-rpm-config-9.0.3-filtering-macros.patch:
 macros |   34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

Index: redhat-rpm-config-9.0.3-filtering-macros.patch
===================================================================
RCS file: /cvs/pkgs/rpms/redhat-rpm-config/F-10/redhat-rpm-config-9.0.3-filtering-macros.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- redhat-rpm-config-9.0.3-filtering-macros.patch	21 Aug 2009 20:54:07 -0000	1.1
+++ redhat-rpm-config-9.0.3-filtering-macros.patch	3 Sep 2009 09:47:06 -0000	1.2
@@ -1,6 +1,6 @@
 --- redhat-rpm-config-9.0.3/macros.orig	2009-08-07 08:48:50.925412526 -0700
 +++ redhat-rpm-config-9.0.3/macros	2009-08-07 08:55:16.374536719 -0700
-@@ -224,3 +224,37 @@
+@@ -236,3 +236,37 @@ kernel_module_package_release	1
  	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 \
  )}


Index: redhat-rpm-config.spec
===================================================================
RCS file: /cvs/pkgs/rpms/redhat-rpm-config/F-10/redhat-rpm-config.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- redhat-rpm-config.spec	1 Sep 2009 22:12:14 -0000	1.60
+++ redhat-rpm-config.spec	3 Sep 2009 09:47:06 -0000	1.61
@@ -1,7 +1,7 @@
-Summary: Red Hat specific rpm configuration files.
+Summary: Red Hat specific rpm configuration files
 Name: redhat-rpm-config
 Version: 9.0.3
-Release: 6%{?dist}
+Release: 7%{?dist}
 # No version specified.
 License: GPL+
 Group: Development/System
@@ -22,6 +22,9 @@ Red Hat specific rpm configuration files
 %patch0 -p0
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+
+%build
 
 %install
 make DESTDIR=${RPM_BUILD_ROOT} install
@@ -34,6 +37,13 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_prefix}/lib/rpm/redhat
 
 %changelog
+* Thu Sep 03 2009 Paul Howarth <paul at city-fan.org> 9.0.3-7
+- limit-smp-16-threads.patch: Rediff so we don't ship a .orig file (#500316)
+- actually apply the filtering macros patch
+- redhat-rpm-config-9.0.3-filtering-macros.patch: Rediff so we don't ship a .orig file
+- add (empty) %%build section
+- fix unescaped macros in changelog
+
 * Fri Aug 21 2009 Chris Weyl <cweyl at alumni.drew.edu> - 9.0.3-6
 - add filtering system macros, w/o backporting other updates (#516240)
 
@@ -107,7 +117,7 @@ rm -rf ${RPM_BUILD_ROOT}
 - Added patch for find-requires. Waiting on write access to public CVS.
 
 * Tue Sep 12 2006 Deepak Bhole <dbhole at redhat.com> 8.0.45-6
-- Fix brp-java-repack-jars to work with builddirs that aren't %name-%version
+- Fix brp-java-repack-jars to work with builddirs that aren't %%name-%%version
 
 * Mon Sep 11 2006 Fernando Nasser <fnasser at redhat.com> - 8.0.45-5
 - Fix order of tokens in find command (thanks mikeb at redhat.com)
@@ -251,7 +261,7 @@ rm -rf ${RPM_BUILD_ROOT}
 - Remove tracking dependency
 
 * Wed Oct 16 2002 Phil Knirsch <pknirsch at redhat.com> 8.0.3-2
-- Added fix for outdated config.[sub|guess] files in %configure section
+- Added fix for outdated config.[sub|guess] files in %%configure section
 
 * Wed Oct 16 2002 Elliot Lee <sopwith at redhat.com> 8.0.3-1
 - New release that blows up on unpackaged files and missing doc files.
@@ -260,7 +270,7 @@ rm -rf ${RPM_BUILD_ROOT}
 - don't redefine everything in macros, just what we need to
 
 * Mon Sep 16 2002 Alexander Larsson <alexl at redhat.com> 8.0.1
-- Add debug package support to %__spec_install_post
+- Add debug package support to %%__spec_install_post
 
 * Tue Sep  3 2002 Bill Nottingham <notting at redhat.com> 8.0-1
 - bump version