dist-git conversion

#2781)

Makefile

@@ -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)

limit-smp-16-threads.patch

@@ -0,0 +1,13 @@
+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`"; \\\
+-	[ "$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.

redhat-rpm-config-9.0.3-always_delete_buildroot_at_install.patch

@@ -0,0 +1,21 @@
+diff -up redhat-rpm-config-9.0.3/macros.BAD redhat-rpm-config-9.0.3/macros
+--- redhat-rpm-config-9.0.3/macros.BAD	2009-07-21 13:22:43.427201497 -0400
++++ redhat-rpm-config-9.0.3/macros	2009-07-21 13:23:57.692440712 -0400
+@@ -73,6 +73,17 @@
+ #==============================================================================
+ # ---- Build policy macros.
+ #
++#
++#---------------------------------------------------------------------
++#	Expanded at beginning of %install scriptlet.
++#
++
++%__spec_install_pre %{___build_pre}\
++    [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf "${RPM_BUILD_ROOT}"\
++    mkdir -p `dirname "$RPM_BUILD_ROOT"`\
++    mkdir "$RPM_BUILD_ROOT"\
++%{nil}
++
+ #---------------------------------------------------------------------
+ #	Expanded at end of %install scriptlet.
+ #

redhat-rpm-config-9.0.3-filtering-macros.patch

@@ -0,0 +1,40 @@
+--- 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
+@@ -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 \
+ )}
++
++#==============================================================================
++# ---- Generic auto req/prov filtering macros 
++#
++# http://fedoraproject.org/wiki/PackagingDrafts/AutoProvidesAndRequiresFiltering
++
++# prevent anything matching from being scanned for provides
++%filter_provides_in(P) %{expand: \
++%global __filter_prov_cmd %{?__filter_prov_cmd} %{__grep} -v %{-P} '%*' | \
++}
++
++# prevent anything matching from being scanned for requires
++%filter_requires_in(P) %{expand: \
++%global __filter_req_cmd %{?__filter_req_cmd} %{__grep} -v %{-P} '%*' | \
++}
++
++# filter anything matching out of the provides stream
++%filter_from_provides() %{expand: \
++%global __filter_from_prov %{?__filter_from_prov} | %{__sed} -e '%*' \
++}
++
++# filter anything matching out of the requires stream
++%filter_from_requires() %{expand: \
++%global __filter_from_req %{?__filter_from_req} | %{__sed} -e '%*' \
++}
++
++# actually set up the filtering bits 
++%filter_setup %{expand: \
++%global _use_internal_dependency_generator 0 \
++%global __deploop() while read FILE; do /usr/lib/rpm/rpmdeps -%{1} ${FILE}; done | /bin/sort -u \
++%global __find_provides /bin/sh -c "%{?__filter_prov_cmd} %{__deploop P} %{?__filter_from_prov}" \
++%global __find_requires /bin/sh -c "%{?__filter_req_cmd}  %{__deploop R} %{?__filter_from_req}" \
++}
++

redhat-rpm-config.spec

@@ -1,12 +1,15 @@
-Summary: Red Hat specific rpm configuration files.
+Summary: Red Hat specific rpm configuration files
 Name: redhat-rpm-config
 Version: 9.0.3
-Release: 3%{?dist}
+Release: 7%{?dist}
 # No version specified.
 License: GPL+
 Group: Development/System
 Source: redhat-rpm-config-%{version}.tar.bz2
 Patch0: redhat-rpm-config-9.0.3-fix-requires.patch
+Patch1: limit-smp-16-threads.patch 
+Patch2: redhat-rpm-config-9.0.3-always_delete_buildroot_at_install.patch
+Patch3: redhat-rpm-config-9.0.3-filtering-macros.patch 
 BuildArch: noarch
 Requires: mktemp
 BuildRoot: %{_tmppath}/%{name}-root
@@ -17,6 +20,11 @@ Red Hat specific rpm configuration files.
 %prep
 %setup -q
 %patch0 -p0
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+
+%build
 
 %install
 make DESTDIR=${RPM_BUILD_ROOT} install
@@ -29,6 +37,22 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_prefix}/lib/rpm/redhat
 
 %changelog
+* Thu Sep 03 2009 Paul Howarth <paul@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@alumni.drew.edu> - 9.0.3-6
+- add filtering system macros, w/o backporting other updates (#516240)
+
+* Tue Jul 21 2009 Tom "spot" Callaway <tcallawa@redhat.com> - 9.0.3-5
+- always delete %%buildroot as first step of %%install (as long as %%buildroot is not /)
+
+* Mon Feb 16 2009 Dennis Gilmore <dennis@ausil.us> - 9.0.3-4
+- limit _smp_flags to -j16
+
 * Wed Sep  3 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 9.0.3-3
 - fix license tag
 - nuke ancient conflicts
@@ -93,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@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@redhat.com> - 8.0.45-5
 - Fix order of tokens in find command (thanks mikeb@redhat.com)
@@ -237,7 +261,7 @@ rm -rf ${RPM_BUILD_ROOT}
 - Remove tracking dependency
 
 * Wed Oct 16 2002 Phil Knirsch <pknirsch@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@redhat.com> 8.0.3-1
 - New release that blows up on unpackaged files and missing doc files.
@@ -246,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@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@redhat.com> 8.0-1
 - bump version