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

diff --git a/attr.php b/attr.php
index a59d7f611f4cd716d047f177c5d5925b6ed943bd..4f430e5548e77c6867618aa778ae72cd3d6eb6cb 100644 (file)
--- 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
 # 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$
 %__php_magic           ^PHP script.*
 %__php_path            \\.php$

diff --git a/macros.kernel b/macros.kernel
index 8aa96bb4dfe10f290691caa791f79fe704446a06..598ba8833373719250fc1a341983a17a88eae415 100644 (file)
--- 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
 
 %_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)
 # 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                                                                                                                          \\\
        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 \\\\\\\
        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 0201b7b168cb2b0aa75b4c49dfe7ec40c91c8e87..af906c277b715e93ef6c4729978132fe8b9cdcac 100644 (file)
--- 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
 %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}
 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
 License:       GPL v2+
 Group:         Development/Building
 Source0:       macros.tld