[packages/rpm-build-macros] rpm4 compat patch for _noautoreq_(perl|pear) on ac

glen glen at pld-linux.org
Fri May 24 10:31:35 CEST 2013


commit a6712c022dd856ed731d1440e4e709710338d8c4
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Fri May 24 11:30:31 2013 +0300

    rpm4 compat patch for _noautoreq_(perl|pear) on ac

 rpm-build-macros.spec |  2 ++
 rpm4.patch            | 11 +++++++++++
 2 files changed, 13 insertions(+)
---
diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index f6978df..3aaec87 100644
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -12,6 +12,7 @@ Source1:	service_generator.sh
 Source3:	find-lang.sh
 Source4:	dokuwiki-find-lang.sh
 Patch0:		disable-systemd.patch
+Patch1:		rpm4.patch
 #Patchx: %{name}-pydebuginfo.patch
 BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	sed >= 4.0
@@ -53,6 +54,7 @@ cp -p %{SOURCE1} .
 %if "%{pld_release}" == "ac"
 %{__sed} -i -e '/libtoolize --copy --force --install/s/ --install//' rpm.macros
 %patch0 -p1
+%patch1 -p1
 %endif
 
 %build
diff --git a/rpm4.patch b/rpm4.patch
new file mode 100644
index 0000000..6959af5
--- /dev/null
+++ b/rpm4.patch
@@ -0,0 +1,11 @@
+--- ./rpm.macros	2013-05-24 11:28:51.286668104 +0300
++++ ./rpm.macros	2013-05-24 11:27:45.091068572 +0300
+@@ -868,7 +857,7 @@
+ # BuildRequires:	rpmbuild(macros) >= 1.654
+ # %define _noautoreq_pear Excluded.php PEAR/Something.php
+ # %define _noautoreq_perl Apache::.*
+-%__noauto_regexp_helper(p:) %(echo "%*" | awk 'BEGIN{RS=" "}{printf("%{-p*}\\\\\\(%%s\\\\\\) ", $1)}')
++%__noauto_regexp_helper(p:) %(echo "%*" | awk 'BEGIN{RS=" "}{printf("%{-p*}\\\\(%%s\\\\) ", $1)}')
+ 
+ #%_noautocompressdoc	%{nil}
+ #
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm-build-macros.git/commitdiff/a6712c022dd856ed731d1440e4e709710338d8c4



More information about the pld-cvs-commit mailing list