- version 1.752: "noarchpackage" macro to cut down boilerplate

diff --git a/macros.pld b/macros.pld
index ed5a8968e13fd82a6c36f92ccbb0c0ea3b1a9f96..93386d5590eabfba013c23030198427a01100e36 100644 (file)
--- a/macros.pld
+++ b/macros.pld
@@ -521,6 +521,14 @@ Provides: %{1} = %{?epoch:%{epoch}:}%{?version:%{version}}%{?release:-%{release}
 %_ver_lt()     %(test $(rpmvercmp "%{1}" "%{2}" >/dev/null 2>&1; echo $?) -ne 2; echo $?)
 %_ver_ge()     %(test $(rpmvercmp "%{1}" "%{2}" >/dev/null 2>&1; echo $?) -eq 2; echo $?)
 
+# noarch subpackage helper
+# BuildRequires:       rpmbuild(macros) >= 1.752
+%noarchpackage \
+%if %{_ver_ge '%{_rpmversion}' '4.6'} \
+BuildArch:             noarch \
+%endif \
+%{nil}
+
 %apache_modules_api %{expand:%%global apache_modules_api %(awk '/#define MODULE_MAGIC_NUMBER_MAJOR/ {print $3}' /usr/include/apache/ap_mmn.h 2>/dev/null || echo ERROR)}%apache_modules_api
 
 # sgml macros

diff --git a/rpm-pld-macros.spec b/rpm-pld-macros.spec
index 4bb0e55da3d88673df4970e7d3aac343b0671ca5..0aa5cf488ef5a652755b30e75d2812598a6182dc 100644 (file)
--- a/rpm-pld-macros.spec
+++ b/rpm-pld-macros.spec
@@ -1,4 +1,4 @@
-%define                rpm_macros_rev  1.751
+%define                rpm_macros_rev  1.752
 %define                find_lang_rev   1.40
 # split into individual X_prov_ver if there is a reason to desync
 %define                prov_ver        4.15