From aba94a5c98998bdfb29640f396188dcf01e2e7b1 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Sun, 22 Dec 2024 15:03:04 +0100 Subject: [PATCH] - merged 2.035 from PLD --- macros.arch | 4 ++-- macros.kernel | 4 +++- macros.php | 2 +- macros.python | 6 +++--- rpm-tld-macros.spec | 13 ++++++++++--- 5 files changed, 19 insertions(+), 10 deletions(-) diff --git a/macros.arch b/macros.arch index bc22441..17ec8f9 100644 --- a/macros.arch +++ b/macros.arch @@ -17,8 +17,8 @@ %arm64_with_neon aarch64 %arm_with_neon %{arm32_with_neon} %{arm64_with_neon} -%arch32 %{ix86} %{arm32} ppc sparc sparcv9 -%arch64 %{x8664} %{arm64} ppc64 sparc64 +%arch32 %{ix86} %{arm32} mips ppc s390 sparc sparcv9 +%arch64 %{x8664} %{arm64} alpha mips64 ppc64 s390x sparc64 # architectures with support for 8-byte (64 bits) atomics %arch_with_atomics64 i586 i686 athlon pentium2 pentium3 pentium4 %{x8664} x32 %{armv7} %{armv8} aarch64 mips64 ppc64 sparcv9 sparc64 diff --git a/macros.kernel b/macros.kernel index 598ba88..c5133a0 100644 --- a/macros.kernel +++ b/macros.kernel @@ -30,12 +30,14 @@ done) %build_kernel_packages %(echo %{_build_kernels} | tr , '\\n' | while read n ; do \ echo %%undefine alt_kernel \ [ -z "$n" -o "$n" = "head" ] || echo %%define alt_kernel $n \ +echo "echo \"Building modules for kernel %%{_kernel_ver}\"" \ echo %%build_kernel_pkg \ done) %install_kernel_packages %(echo %{_build_kernels} | tr , '\\n' | while read n ; do \ echo %%undefine alt_kernel \ [ -z "$n" -o "$n" = "head" ] || echo %%define alt_kernel $n \ +echo "echo \"Installing modules for kernel %%{_kernel_ver}\"" \ echo %%install_kernel_pkg \ done) @@ -93,7 +95,7 @@ done) %_kernel_arch \\\ %ifarch aarch64\ -arm64\ +arm64\\\ %endif\ %ifarch ppc ppc64\ powerpc\\\ diff --git a/macros.php b/macros.php index 31a0b14..7fe74f9 100644 --- a/macros.php +++ b/macros.php @@ -158,7 +158,7 @@ fi \ cat %{-z:$_N/}.install.log | %__pear_install_log \ %undos -f php,html,js,xml \ %{!?_noautocompressdoc:%global _noautocompressdoc %{nil}}%{expand:%%global _noautocompressdoc %{_noautocompressdoc} optional-packages.txt} \ -%{!?_noautoprov:%global _noautoprov %{nil}}%{expand:%%global _noautoprov %{_noautoprov} 'pear(tests/.*)'} \ +%{!?_noautoprov:%global _noautoprov %{nil}}%{expand:%%global _noautoprov %{_noautoprov} 'pear\\\\(tests/.*\\\\)'} \ %{nil} # Copies extracted PEAR package structure and PEAR registry to buildroot. diff --git a/macros.python b/macros.python index 5a012b5..ef8b744 100644 --- a/macros.python +++ b/macros.python @@ -15,9 +15,9 @@ %py_dyndir %{py_libdir}/lib-dynload # pure python modules compilation -%py_comp python -c "import compileall; import sys; compileall.compile_dir(sys.argv[1], ddir=sys.argv[1][len('$RPM_BUILD_ROOT'):])" +%py_comp %{__python} -c "import compileall; import sys; compileall.compile_dir(sys.argv[1], ddir=sys.argv[1][len('$RPM_BUILD_ROOT'):])" -%py_ocomp python -O -c "import compileall; import sys; compileall.compile_dir(sys.argv[1], ddir=sys.argv[1][len('$RPM_BUILD_ROOT'):])" +%py_ocomp %{__python} -O -c "import compileall; import sys; compileall.compile_dir(sys.argv[1], ddir=sys.argv[1][len('$RPM_BUILD_ROOT'):])" # Software written in Python language require Python with main version %pyrequires_eq() Requires: %1 @@ -156,7 +156,7 @@ done \ %py_lint() \ __py_lint() { \ %{!?debug:set +x;} \ -find "$@" -type f -name '*.py' | python -c ' \ +find "$@" -type f -name '*.py' | %{__python} -c ' \ import sys \ import compiler \ \ diff --git a/rpm-tld-macros.spec b/rpm-tld-macros.spec index af906c2..7d82b8d 100644 --- a/rpm-tld-macros.spec +++ b/rpm-tld-macros.spec @@ -1,4 +1,4 @@ -%define rpm_macros_rev 2.030 +%define rpm_macros_rev 2.035 %define find_lang_rev 1.42 # split into individual X_prov_ver if there is a reason to desync %define prov_ver 4.15 @@ -54,7 +54,7 @@ Source55: macros.rust Source56: macros.arch Source57: macros.go Source58: macros.qt - +Source59: macros.erlang Source60: macros.gstreamer Source61: attr.gstreamer @@ -73,6 +73,9 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) # redefine to bootstrap %define _usrlibrpm %{_prefix}/lib/rpm +# don't generate pear reqs for optional deps +%define _noautoreq_pear .* + %description This package contains rpm macros for TLD Linux. @@ -149,8 +152,11 @@ RPM. Summary: Additional utilities for checking PHP PEAR provides/requires in RPM packages Summary(pl.UTF-8): Dodatkowe narzędzia do sprawdzania zależności skryptów php w RPM Group: Applications/File +# The scripts are in perl +Requires: perl-base Requires: %{name}-build = %{version}-%{release} Requires: sed >= 4.0 +# Alternate req script in PHP Suggests: php-pear-PHP_CompatInfo Provides: rpm-php-pearprov = %{prov_ver} Obsoletes: rpm-php-pearprov @@ -235,7 +241,7 @@ cp -p %{SOURCE55} $RPM_BUILD_ROOT%{_usrlibrpm}/macros.d/macros.rust cp -p %{SOURCE56} $RPM_BUILD_ROOT%{_usrlibrpm}/macros.d/macros.arch cp -p %{SOURCE57} $RPM_BUILD_ROOT%{_usrlibrpm}/macros.d/macros.go cp -p %{SOURCE58} $RPM_BUILD_ROOT%{_usrlibrpm}/macros.d/macros.qt - +cp -p %{SOURCE59} $RPM_BUILD_ROOT%{_usrlibrpm}/macros.d/macros.erlang cp -p %{SOURCE60} $RPM_BUILD_ROOT%{_usrlibrpm}/macros.d/macros.gstreamer cp -p %{SOURCE61} $RPM_BUILD_ROOT%{_usrlibrpm}/fileattrs/gstreamer.attr cp -p %{SOURCE63} $RPM_BUILD_ROOT%{_usrlibrpm}/fileattrs/mono.attr @@ -261,6 +267,7 @@ rm -rf $RPM_BUILD_ROOT %{_usrlibrpm}/macros.d/macros.browser-plugins %{_usrlibrpm}/macros.d/macros.cacti %{_usrlibrpm}/macros.d/macros.emacs +%{_usrlibrpm}/macros.d/macros.erlang %{_usrlibrpm}/macros.d/macros.ghc %{_usrlibrpm}/macros.d/macros.go %{_usrlibrpm}/macros.d/macros.gstreamer -- 2.49.0