From: Marcin Krol <hawk@tld-linux.org>
Date: Thu, 25 Apr 2024 01:28:31 +0000 (+0200)
Subject: - merged 2.030 from PLD, re-enabled PHP dependency generators
X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;ds=sidebyside;p=packages%2Frpm-tld-macros.git

- merged 2.030 from PLD, re-enabled PHP dependency generators
---

diff --git a/attr.php b/attr.php
index a59d7f6..4f430e5 100644
--- a/attr.php
+++ b/attr.php
@@ -1,5 +1,5 @@
-#__php_provides		%{_rpmconfigdir}/php.prov
+%__php_provides		%{_rpmconfigdir}/php.prov
 # define 'php_req_new' in ~/.rpmmacros to use php version of req finder
-#__php_requires		env PHP_MIN_VERSION=%{?php_min_version} %{_rpmconfigdir}/php.req%{?php_req_new:.php}
+%__php_requires		env PHP_MIN_VERSION=%{?php_min_version} %{_rpmconfigdir}/php.req%{?php_req_new:.php}
 %__php_magic		^PHP script.*
 %__php_path		\\.php$
diff --git a/macros.kernel b/macros.kernel
index 8aa96bb..598ba88 100644
--- a/macros.kernel
+++ b/macros.kernel
@@ -91,6 +91,18 @@ done)
 %_host_base_arch	%{expand:%%global _host_base_arch %(echo %{_host_cpu} | sed 's/i.86/i386/;s/athlon/i386/;s/pentium./i386/;s/amd64/x86_64/;s/ia32e/x86_64/;s/x32/x86_64/;s/sparcv./sparc/;s/arm.*/arm/')}%_host_base_arch
 %_target_base_arch	%{expand:%%global _target_base_arch %(echo %{_target_cpu} | sed 's/i.86/i386/;s/athlon/i386/;s/pentium./i386/;s/amd64/x86_64/;s/ia32e/x86_64/;s/x32/x86_64/;s/sparcv./sparc/;s/arm.*/arm/')}%_target_base_arch
 
+%_kernel_arch	\\\
+%ifarch aarch64\
+arm64\
+%endif\
+%ifarch ppc ppc64\
+powerpc\\\
+%endif\
+%ifnarch aarch64 ppc ppc64\
+%{_target_base_arch}\\\
+%endif\
+%{nil}
+
 # Compression used for %__spec_install_post_compress_modules
 # Supported values:
 # - "gzip -9nf" (module-init-tools and kmod)
@@ -164,15 +176,7 @@ done)
 	ARCH=%{_target_base_arch} CROSS_COMPILE=%{_target_cpu}-pld-linux- \\\
 	%endif															\\\
 %else																\\\
-	%ifarch aarch64													\\\
-	ARCH=arm64														\\\
-	%endif															\\\
-	%ifarch ppc ppc64												\\\
-	ARCH=powerpc													\\\
-	%endif															\\\
-	%ifnarch aarch64 ppc ppc64										\\\
-	ARCH=%{_target_base_arch}										\\\
-	%endif															\\\
+	ARCH=%_kernel_arch												\\\\\\\
 	CC="%{__cc}"													\\\
 %endif																\
 %define	MakeOpts HOSTCC="%{__cc}" SYSSRC=%{_kernelsrcdir} SYSOUT=$PWD/o \\\\\\\
diff --git a/rpm-tld-macros.spec b/rpm-tld-macros.spec
index 0201b7b..af906c2 100644
--- a/rpm-tld-macros.spec
+++ b/rpm-tld-macros.spec
@@ -1,4 +1,4 @@
-%define		rpm_macros_rev	2.029
+%define		rpm_macros_rev	2.030
 %define		find_lang_rev	1.42
 # split into individual X_prov_ver if there is a reason to desync
 %define		prov_ver	4.15
@@ -6,7 +6,7 @@ Summary:	TLD Linux RPM macros
 Summary(pl.UTF-8):	Makra RPM dla Linuksa TLD
 Name:		rpm-tld-macros
 Version:	%{rpm_macros_rev}
-Release:	2
+Release:	1
 License:	GPL v2+
 Group:		Development/Building
 Source0:	macros.tld