From: Jan Rękorajski <baggins@pld-linux.org>
Date: Sun, 18 Oct 2020 15:20:59 +0000 (+0200)
Subject: - short-circuit noarchpackage macros to 'BuildArch: noarch', condition is always... 
X-Git-Tag: auto/th/rpm-pld-macros-1.753-1.1~7
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=c9769947b6dca7048451230cb5f20e7f760d78ac;p=packages%2Frpm-pld-macros.git

- short-circuit noarchpackage macros to 'BuildArch: noarch', condition is always true
---

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