rpms/redhat-rpm-config/F-11 redhat-rpm-config-9.0.3-filtering-macros.patch, NONE, 1.1 redhat-rpm-config.spec, 1.64, 1.65
Chris Weyl
cweyl at fedoraproject.org
Fri Aug 21 20:48:08 UTC 2009
- Previous message (by thread): rpms/gabedit/F-11 .cvsignore, 1.5, 1.6 gabedit.spec, 1.5, 1.6 sources, 1.5, 1.6 gabedit.desktop, 1.1, NONE
- Next message (by thread): rpms/unixODBC/F-11 odbcint64-config.patch, NONE, 1.1 odbcinst.ini, 1.4, 1.5 unixODBC.spec, 1.49, 1.50 import.log, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: cweyl
Update of /cvs/extras/rpms/redhat-rpm-config/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24426
Modified Files:
redhat-rpm-config.spec
Added Files:
redhat-rpm-config-9.0.3-filtering-macros.patch
Log Message:
* Fri Aug 21 2009 Chris Weyl <cweyl at alumni.drew.edu> 9.0.3-11
- add filtering system macros, w/o backporting other updates (#516240)
redhat-rpm-config-9.0.3-filtering-macros.patch:
macros | 34 ++++++++++++++++++++++++++++++++++
1 file changed, 34 insertions(+)
--- NEW FILE redhat-rpm-config-9.0.3-filtering-macros.patch ---
--- 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 @@
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}" \
+}
+
Index: redhat-rpm-config.spec
===================================================================
RCS file: /cvs/extras/rpms/redhat-rpm-config/F-11/redhat-rpm-config.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- redhat-rpm-config.spec 21 Jul 2009 17:35:50 -0000 1.64
+++ redhat-rpm-config.spec 21 Aug 2009 20:48:08 -0000 1.65
@@ -1,7 +1,7 @@
Summary: Red Hat specific rpm configuration files.
Name: redhat-rpm-config
Version: 9.0.3
-Release: 10%{?dist}
+Release: 11%{?dist}
# No version specified.
License: GPL+
Group: Development/System
@@ -11,6 +11,8 @@ Patch1: limit-smp-16-threads.patch
Patch2: redhat-rpm-config-9.0.3-F-11-Architectures.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
Requires: mktemp
BuildRoot: %{_tmppath}/%{name}-root
@@ -25,6 +27,7 @@ Red Hat specific rpm configuration files
%patch2 -p1
%patch3 -p1
%patch4 -p1
+%patch5 -p1
%install
make DESTDIR=${RPM_BUILD_ROOT} install
@@ -37,6 +40,9 @@ rm -rf ${RPM_BUILD_ROOT}
%{_prefix}/lib/rpm/redhat
%changelog
+* Fri Aug 21 2009 Chris Weyl <cweyl at 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 at redhat.com> - 9.0.3-10
- always delete %%buildroot as first step of %%install (as long as %buildroot is not /)
- Previous message (by thread): rpms/gabedit/F-11 .cvsignore, 1.5, 1.6 gabedit.spec, 1.5, 1.6 sources, 1.5, 1.6 gabedit.desktop, 1.1, NONE
- Next message (by thread): rpms/unixODBC/F-11 odbcint64-config.patch, NONE, 1.1 odbcinst.ini, 1.4, 1.5 unixODBC.spec, 1.49, 1.50 import.log, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list