commit c9769947b6dca7048451230cb5f20e7f760d78ac
Author: Jan Rękorajski <[email protected]>
Date: Sun Oct 18 17:20:59 2020 +0200
- short-circuit noarchpackage macros to 'BuildArch: noarch', condition is
always true
macros.pld | 2 --
1 file changed, 2 deletions(-)
---
diff --git a/macros.pld b/macros.pld
index d633866..aa90853 100644
--- a/macros.pld
+++ b/macros.pld
@@ -680,9 +680,7 @@ Provides: %{1} =
%{?epoch:%{epoch}:}%{?version:%{version}}%{?release:-%{release}
# 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
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm-pld-macros.git/commitdiff/c9769947b6dca7048451230cb5f20e7f760d78ac
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
