Compare commits
8 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
910c56b977 | ||
|
56a5c977cb | ||
|
49c446469a | ||
|
fe6fbdfce8 | ||
|
6f1f73521a | ||
|
f1c1ea0376 | ||
|
53f4654493 | ||
|
310955d11a |
0
.cvsignore → .gitignore
vendored
0
.cvsignore → .gitignore
vendored
21
Makefile
21
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)
|
|
@ -1,7 +1,7 @@
|
|||||||
diff -Nur redhat-rpm-config-9.0.2-orig/macros redhat-rpm-config-9.0.2/macros
|
diff -up redhat-rpm-config-9.0.3/macros.orig redhat-rpm-config-9.0.3/macros
|
||||||
--- redhat-rpm-config-9.0.2-orig/macros 2008-04-03 02:14:54.000000000 -0500
|
--- redhat-rpm-config-9.0.3/macros.orig 2008-05-06 19:08:20.000000000 -0400
|
||||||
+++ redhat-rpm-config-9.0.2/macros 2008-05-20 13:33:15.000000000 -0500
|
+++ redhat-rpm-config-9.0.3/macros 2009-06-03 15:00:28.000000000 -0400
|
||||||
@@ -68,7 +68,8 @@
|
@@ -67,7 +67,8 @@
|
||||||
|
|
||||||
%_smp_mflags %([ -z "$RPM_BUILD_NCPUS" ] \\\
|
%_smp_mflags %([ -z "$RPM_BUILD_NCPUS" ] \\\
|
||||||
&& RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"; \\\
|
&& RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"; \\\
|
||||||
|
@ -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.
|
||||||
|
#
|
40
redhat-rpm-config-9.0.3-filtering-macros.patch
Normal file
40
redhat-rpm-config-9.0.3-filtering-macros.patch
Normal file
@ -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
|
||||||
|
@@ -240,3 +240,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}" \
|
||||||
|
+}
|
||||||
|
+
|
@ -1,7 +1,7 @@
|
|||||||
Summary: Red Hat specific rpm configuration files.
|
Summary: Red Hat specific rpm configuration files
|
||||||
Name: redhat-rpm-config
|
Name: redhat-rpm-config
|
||||||
Version: 9.0.3
|
Version: 9.0.3
|
||||||
Release: 8%{?dist}
|
Release: 12%{?dist}
|
||||||
# No version specified.
|
# No version specified.
|
||||||
License: GPL+
|
License: GPL+
|
||||||
Group: Development/System
|
Group: Development/System
|
||||||
@ -10,6 +10,9 @@ Patch0: redhat-rpm-config-9.0.3-fix-requires.patch
|
|||||||
Patch1: limit-smp-16-threads.patch
|
Patch1: limit-smp-16-threads.patch
|
||||||
Patch2: redhat-rpm-config-9.0.3-F-11-Architectures.patch
|
Patch2: redhat-rpm-config-9.0.3-F-11-Architectures.patch
|
||||||
Patch3: redhat-rpm-config-9.0.3-F-11-StrongerHashes.patch
|
Patch3: redhat-rpm-config-9.0.3-F-11-StrongerHashes.patch
|
||||||
|
Patch4: redhat-rpm-config-9.0.3-always_delete_buildroot_at_install.patch
|
||||||
|
Patch5: redhat-rpm-config-9.0.3-filtering-macros.patch
|
||||||
|
BuildArch: noarch
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
Requires: mktemp
|
Requires: mktemp
|
||||||
BuildRoot: %{_tmppath}/%{name}-root
|
BuildRoot: %{_tmppath}/%{name}-root
|
||||||
@ -23,6 +26,10 @@ Red Hat specific rpm configuration files.
|
|||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
%patch2 -p1
|
%patch2 -p1
|
||||||
%patch3 -p1
|
%patch3 -p1
|
||||||
|
%patch4 -p1
|
||||||
|
%patch5 -p1
|
||||||
|
|
||||||
|
%build
|
||||||
|
|
||||||
%install
|
%install
|
||||||
make DESTDIR=${RPM_BUILD_ROOT} install
|
make DESTDIR=${RPM_BUILD_ROOT} install
|
||||||
@ -35,6 +42,20 @@ rm -rf ${RPM_BUILD_ROOT}
|
|||||||
%{_prefix}/lib/rpm/redhat
|
%{_prefix}/lib/rpm/redhat
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Sep 03 2009 Paul Howarth <paul@city-fan.org> 9.0.3-12
|
||||||
|
- 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-11
|
||||||
|
- add filtering system macros, w/o backporting other updates (#516240)
|
||||||
|
|
||||||
|
* Tue Jul 21 2009 Tom "spot" Callaway <tcallawa@redhat.com> - 9.0.3-10
|
||||||
|
- always delete %%buildroot as first step of %%install (as long as %%buildroot is not /)
|
||||||
|
|
||||||
|
* Wed Jun 03 2009 Adam Jackson <ajax@redhat.com> 9.0.3-9
|
||||||
|
- limit-smp-16-threads.patch: Rediff so we don't ship a .orig file (#500316)
|
||||||
|
|
||||||
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 9.0.3-8
|
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 9.0.3-8
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
|
||||||
|
|
||||||
@ -118,7 +139,7 @@ rm -rf ${RPM_BUILD_ROOT}
|
|||||||
- Added patch for find-requires. Waiting on write access to public CVS.
|
- 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
|
* 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
|
* Mon Sep 11 2006 Fernando Nasser <fnasser@redhat.com> - 8.0.45-5
|
||||||
- Fix order of tokens in find command (thanks mikeb@redhat.com)
|
- Fix order of tokens in find command (thanks mikeb@redhat.com)
|
||||||
@ -262,7 +283,7 @@ rm -rf ${RPM_BUILD_ROOT}
|
|||||||
- Remove tracking dependency
|
- Remove tracking dependency
|
||||||
|
|
||||||
* Wed Oct 16 2002 Phil Knirsch <pknirsch@redhat.com> 8.0.3-2
|
* 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
|
* 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.
|
- New release that blows up on unpackaged files and missing doc files.
|
||||||
@ -271,7 +292,7 @@ rm -rf ${RPM_BUILD_ROOT}
|
|||||||
- don't redefine everything in macros, just what we need to
|
- don't redefine everything in macros, just what we need to
|
||||||
|
|
||||||
* Mon Sep 16 2002 Alexander Larsson <alexl@redhat.com> 8.0.1
|
* 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
|
* Tue Sep 3 2002 Bill Nottingham <notting@redhat.com> 8.0-1
|
||||||
- bump version
|
- bump version
|
||||||
|
Loading…
Reference in New Issue
Block a user