- add filtering system macros, w/o backporting other updates (#516240)
This commit is contained in:
parent
f1c1ea0376
commit
6f1f73521a
|
@ -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
|
||||
@@ -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}" \
|
||||
+}
|
||||
+
|
|
@ -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@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 /)
|
||||
|
||||
|
|
Loading…
Reference in New Issue