dist-git conversion

Fix typo that causes a failure to update the common directory. (releng
#2781)
2010-07-29 17:59:03 +00:00 · 2009-11-26 01:27:16 +00:00 · 2008-05-20 19:20:15 +00:00 · 2008-04-21 18:15:55 +00:00
4 changed files with 19 additions and 22 deletions
--- a/.gitignore
+++ b/.gitignore
--- a/21
+++ b/21
@ -1,21 +0,0 @@
-# Makefile for source rpm: redhat-rpm-config
-# $Id: Makefile,v 1.1 2004/09/09 11:26:44 cvsdist Exp $
-NAME := redhat-rpm-config
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attempt a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
--- a/limit-smp-16-threads.patch
+++ b/limit-smp-16-threads.patch
@ -0,0 +1,13 @@
+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 @@
+ 
+ %_smp_mflags %([ -z "$RPM_BUILD_NCPUS" ] \\\
+ 	&& RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"; \\\
+-	[ "$RPM_BUILD_NCPUS" -gt 1 ] && echo "-j$RPM_BUILD_NCPUS")
+        if [ "$RPM_BUILD_NCPUS" -gt 16 ]; then echo "-j16"; \\\
+        elif [ "$RPM_BUILD_NCPUS" -gt 1 ]; then echo "-j$RPM_BUILD_NCPUS"; fi)
+ 
+ #==============================================================================
+ # ---- Build policy macros.
--- a/redhat-rpm-config.spec
+++ b/redhat-rpm-config.spec
@ -1,10 +1,11 @@
 Summary: Red Hat specific rpm configuration files.
 Name: redhat-rpm-config
 Version: 9.0.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Development/System
 Source: redhat-rpm-config-%{version}.tar.bz2
+Patch0: limit-smp-16-threads.patch
 BuildArch: noarch
 Requires: mktemp
 # if rpm-build is present (thus building rpms), we need newer for 
@ -21,6 +22,7 @@ Red Hat specific rpm configuration files.

 %prep
 %setup -q
+%patch0 -p1

 %install
 make DESTDIR=${RPM_BUILD_ROOT} install
@ -33,6 +35,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_prefix}/lib/rpm/redhat

 %changelog
+* Tue May 20 2008 Dennis Gilmore <dennis@ausil.us> - 9.0.2-2
+- limit smp to 16 threads
+
 * Thu Apr 03 2008 Jon Masters <jcm@redhat.com> - 9.0.2-1
 - Remove smp dependencies
 - Update config.guess|sub files
Author	SHA1	Message	Date
Fedora Release Engineering	4a260543f4	dist-git conversion	2010-07-29 17:59:03 +00:00
Bill Nottingham	5352362196	Fix typo that causes a failure to update the common directory. (releng #2781)	2009-11-26 01:27:16 +00:00
Dennis Gilmore	6814bc69fb	limit smp_mflags to 16 when we use 32 we get things building out of order	2008-05-20 19:20:15 +00:00
Jesse Keating	e4599975bc	Initialize branch F-9 for redhat-rpm-config	2008-04-21 18:15:55 +00:00