rpms/redhat-rpm-config/devel limit-smp-16-threads.patch, NONE, 1.1 redhat-rpm-config.spec, 1.56, 1.57

Dennis Gilmore ausil at fedoraproject.org
Mon Feb 16 17:08:12 UTC 2009


Author: ausil

Update of /cvs/pkgs/rpms/redhat-rpm-config/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30398

Modified Files:
	redhat-rpm-config.spec 
Added Files:
	limit-smp-16-threads.patch 
Log Message:
limit -smp_mflags to -j16


limit-smp-16-threads.patch:

--- NEW FILE limit-smp-16-threads.patch ---
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.


Index: redhat-rpm-config.spec
===================================================================
RCS file: /cvs/pkgs/rpms/redhat-rpm-config/devel/redhat-rpm-config.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- redhat-rpm-config.spec	3 Sep 2008 20:22:56 -0000	1.56
+++ redhat-rpm-config.spec	16 Feb 2009 17:07:41 -0000	1.57
@@ -1,22 +1,28 @@
 Summary: Red Hat specific rpm configuration files.
 Name: redhat-rpm-config
-Version: 9.0.3
-Release: 3%{?dist}
-# No version specified.
-License: GPL+
+Version: 9.0.2
+Release: 2%{?dist}
+License: GPL
 Group: Development/System
 Source: redhat-rpm-config-%{version}.tar.bz2
-Patch0: redhat-rpm-config-9.0.3-fix-requires.patch
+Patch0: limit-smp-16-threads.patch
 BuildArch: noarch
 Requires: mktemp
+# if rpm-build is present (thus building rpms), we need newer for 
+# check buildroot 
+Conflicts: rpm-build < 4.4.2.1-0.4.rc2
 BuildRoot: %{_tmppath}/%{name}-root
+# rpmrc passes -mtune which first appeared in gcc 3.4
+%ifarch i386 i686 sparc
+Conflicts: gcc < 3.4
+%endif
 
 %description
 Red Hat specific rpm configuration files.
 
 %prep
 %setup -q
-%patch0 -p0
+%patch0 -p1
 
 %install
 make DESTDIR=${RPM_BUILD_ROOT} install
@@ -29,18 +35,8 @@
 %{_prefix}/lib/rpm/redhat
 
 %changelog
-* Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 9.0.3-3
-- fix license tag
-- nuke ancient conflicts
-
-* Mon Aug 11 2008 Panu Matilainen <pmatilai at redhat.com> - 9.0.3-2
-- Unbreak find-requires (#443015)
-
-* Tue May 06 2008 Jon Masters <jcm at redhat.com> - 9.0.3-1
-- Ensure Java Jar files have readable files within.
-- Remove overwritten config.guess|sub files (testing).
-- Fix Fortran flags for building using _fmoddir.
-- Pull in objdump fix to upstream find-requires.
+* Tue May 20 2008 Dennis Gilmore <dennis at ausil.us> - 9.0.2-2
+- limit smp to 16 threads
 
 * Thu Apr 03 2008 Jon Masters <jcm at redhat.com> - 9.0.2-1
 - Remove smp dependencies




More information about the scm-commits mailing list