commit 4e311fe4f2771687d7bf147445eb61273eddd68b
Author: Jakub Bogusz <[email protected]>
Date: Thu Nov 30 17:35:10 2017 +0100
- version 1.730: added _noautoreq_mono
rpm-build-macros.spec | 2 +-
rpm.macros | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index 4e17fe3..a7a50e7 100644
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -1,4 +1,4 @@
-%define rpm_macros_rev 1.729
+%define rpm_macros_rev 1.730
%define find_lang_rev 1.40
Summary: PLD Linux RPM build macros
Summary(pl.UTF-8): Makra do budowania pakietów RPM dla Linuksa PLD
diff --git a/rpm.macros b/rpm.macros
index 50a4d5e..e93ce4e 100644
--- a/rpm.macros
+++ b/rpm.macros
@@ -926,9 +926,10 @@ fi; \
%__noautoprov %(sed -e s'/#.*//' /etc/rpm/noautoprov)%{?_noautoprov:
%{_noautoprov}}
%__noautoreq %(sed -e s'/#.*//' /etc/rpm/noautoreq) \
%{?_noautoreq: %{_noautoreq}} \
+ %{?_noautoreq_java: %{__noauto_regexp_helper -p java
%{_noautoreq_java}}} \
+ %{?_noautoreq_mono: %{__noauto_regexp_helper -p mono
%{_noautoreq_java}}} \
%{?_noautoreq_pear: %{__noauto_regexp_helper -p pear
%{_noautoreq_pear}}} \
%{?_noautoreq_perl: %{__noauto_regexp_helper -p perl
%{_noautoreq_perl}}} \
- %{?_noautoreq_java: %{__noauto_regexp_helper -p java
%{_noautoreq_java}}} \
%{?_noautoreq_pyegg: %{__noauto_regexp_helper -p pythonegg
%{_noautoreq_pyegg}}} \
%{?_noautoreq_py3egg: %{__noauto_regexp_helper -p python3egg
%{_noautoreq_py3egg}}} \
%{nil}
@@ -944,6 +945,8 @@ fi; \
# BuildRequires: rpmbuild(macros) >= 1.709
# %define _noautoreq_pyegg argparse
# %define _noautoreq_py3egg backports.ssl-match-hostname ipaddress
+# BuildRequires: rpmbuild(macros) >= 1.730
+# %define _noautoreq_mono Gendarme.Framework
#
%__noauto_regexp_helper(p:) %(echo "%*" | awk 'BEGIN{RS="
"}{printf("%{-p*}%{__qchar}(%%s%{__qchar}) ", $1)}')
# detect quote character runtime
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm-build-macros.git/commitdiff/4e311fe4f2771687d7bf147445eb61273eddd68b
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
