v1.672: add _noautoreq_java

diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index cb9986f7df740f2d2342a953b7bfb67f3b29495f..7d71bb4eeb81e64e7067c5fb531f440c86d7dd98 100644 (file)
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -5,13 +5,13 @@
 %if "%{pld_release}" == "ac"
 %define        with_rpm4       1
 %endif
-%define                rpm_macros_rev  1.671
+%define                rpm_macros_rev  1.672
 %define                find_lang_rev   1.36
 Summary:       PLD Linux RPM build macros
 Summary(pl.UTF-8):     Makra do budowania pakietów RPM dla Linuksa PLD
 Name:          rpm-build-macros
 Version:       %{rpm_macros_rev}
-Release:       2
+Release:       1
 License:       GPL
 Group:         Development/Building
 Source0:       rpm.macros

diff --git a/rpm.macros b/rpm.macros
index c763840e7e002ecc4bf808aee3504efecd131dc0..ab473a6b213a7a0bb0b605f6336293a993c3c85e 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -867,6 +867,7 @@ fi; \
        %{?_noautoreq: %{_noautoreq}} \
        %{?_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}}} \
        %{nil}
 
 # helper for wrapping _noautoreq between perl() or pear()
@@ -875,6 +876,8 @@ fi; \
 # BuildRequires:       rpmbuild(macros) >= 1.654
 # %define _noautoreq_pear Excluded.php PEAR/Something.php
 # %define _noautoreq_perl Apache::.*
+# BuildRequires:       rpmbuild(macros) >= 1.672
+# %define _noautoreq_java ClassDataVersion
 %__noauto_regexp_helper(p:) %(echo "%*" | awk 'BEGIN{RS=" "}{printf("%{-p*}\\\\\\(%%s\\\\\\) ", $1)}')
 
 #%_noautocompressdoc   %{nil}