rpms/redhat-rpm-config/devel redhat-rpm-config-9.0.3-filtering-macros.patch, NONE, 1.1 redhat-rpm-config.spec, 1.71, 1.72
Chris Weyl
cweyl at fedoraproject.org
Wed Aug 19 06:08:05 UTC 2009
- Previous message: rpms/syslog-ng/devel syslog-ng.init.d, 1.1, 1.2 syslog-ng.spec, 1.42, 1.43
- Next message: rpms/heartbeat/devel .cvsignore, 1.11, 1.12 heartbeat.spec, 1.37, 1.38 sources, 1.11, 1.12
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: cweyl
Update of /cvs/extras/rpms/redhat-rpm-config/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16906
Modified Files:
redhat-rpm-config.spec
Added Files:
redhat-rpm-config-9.0.3-filtering-macros.patch
Log Message:
* Tue Aug 18 2009 Chris Weyl <cweyl at alumni.drew.edu> 9.0.3-16
- add the filtering framework approved by the FPC/FESCo. (#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/devel/redhat-rpm-config.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- redhat-rpm-config.spec 13 Aug 2009 17:24:04 -0000 1.71
+++ redhat-rpm-config.spec 19 Aug 2009 06:08:05 -0000 1.72
@@ -1,7 +1,7 @@
Summary: Red Hat specific rpm configuration files.
Name: redhat-rpm-config
Version: 9.0.3
-Release: 15%{?dist}
+Release: 16%{?dist}
# No version specified.
License: GPL+
Group: Development/System
@@ -15,6 +15,7 @@ Patch5: redhat-rpm-config-9.0.3-always_d
Patch6: redhat-rpm-config-9.0.3-xz-payload.patch
Patch7: redhat-rpm-config-9.0.3-jars-with-spaces.patch
Patch8: redhat-rpm-config-9.0.3-brpssa-speedup.patch
+Patch9: redhat-rpm-config-9.0.3-filtering-macros.patch
BuildArch: noarch
Requires: mktemp
BuildRoot: %{_tmppath}/%{name}-root
@@ -33,6 +34,7 @@ Red Hat specific rpm configuration files
%patch6 -p1
%patch7 -p5
%patch8 -p1
+%patch9 -p1
%install
make DESTDIR=${RPM_BUILD_ROOT} install
@@ -45,6 +47,9 @@ rm -rf ${RPM_BUILD_ROOT}
%{_prefix}/lib/rpm/redhat
%changelog
+* Tue Aug 18 2009 Chris Weyl <cweyl at alumni.drew.edu> 9.0.3-16
+- add the filtering framework approved by the FPC/FESCo. (#516240)
+
* Thu Aug 13 2009 Adam Jackson <ajax at redhat.com> 9.0.3-15
- redhat-rpm-config-9.0.4-brpssa-speedup.patch: When looking for static
archives, only run file(1) on files named *.a. (#517101)
- Previous message: rpms/syslog-ng/devel syslog-ng.init.d, 1.1, 1.2 syslog-ng.spec, 1.42, 1.43
- Next message: rpms/heartbeat/devel .cvsignore, 1.11, 1.12 heartbeat.spec, 1.37, 1.38 sources, 1.11, 1.12
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list