From a1577464e2c16aac2e59056272c2f05f92faeabe Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 21 Jun 2023 10:35:34 +0200 Subject: define %scl_vendor and %_scl_prefix in macros.php71-config redefine %__phpize and %__phpconfig move man page out of scl tree improve the man page --- php71.spec | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) (limited to 'php71.spec') diff --git a/php71.spec b/php71.spec index 70854cd..c8ab483 100644 --- a/php71.spec +++ b/php71.spec @@ -1,7 +1,7 @@ # remirepo spec file for php71 SCL metapackage # -# Copyright (c) 2016-2019 Remi Collet -# License: CC-BY-SA +# Copyright (c) 2016-2023 Remi Collet +# License: CC-BY-SA-4.0 # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries @@ -33,10 +33,10 @@ Summary: Package that installs PHP 7.1 Name: %scl_name -Version: 2.0 +Version: 7.1 Release: 1%{?dist} Group: Development/Languages -License: GPLv2+ +License: GPL-2.0-or-later Source0: macros-build Source1: README @@ -162,7 +162,7 @@ cp %{SOURCE2} . # generate a helper script that will be used by help2man cat >h2m_helper <<'EOF' #!/bin/bash -[ "$1" == "--version" ] && echo "%{scl_name} %{version} Software Collection" || cat README +[ "$1" == "--version" ] && echo "%{scl_name} Software Collection (PHP %{version})" || cat README EOF chmod a+x h2m_helper @@ -178,7 +178,7 @@ install -D -m 644 envmod %{buildroot}%{_scl_scripts}/%{scl_name} install -D -m 644 envmod %{buildroot}%{_root_datadir}/Modules/modulefiles/%{scl_name} %endif install -D -m 644 scldev %{buildroot}%{macrosdir}/macros.%{scl_name_base}-scldevel -install -D -m 644 %{scl_name}.7 %{buildroot}%{_mandir}/man7/%{scl_name}.7 +install -D -m 644 %{scl_name}.7 %{buildroot}%{_root_mandir}/man7/%{scl_name}.7 install -d -m 755 %{buildroot}%{_datadir}/licenses install -d -m 755 %{buildroot}%{_datadir}/doc/pecl @@ -190,7 +190,7 @@ install -d -m 755 %{buildroot}%{_localstatedir}/lib/pear/pkgxml cat %{buildroot}%{_root_sysconfdir}/rpm/macros.%{scl}-config # Add the scl_package_override macro -sed -e 's/@SCL@/%{scl}/g' %{SOURCE0} \ +sed -e 's/@SCL@/%{scl}/g;s:@PREFIX@:/opt/%{scl_vendor}:;s/@VENDOR@/%{scl_vendor}/' %{SOURCE0} \ | tee -a %{buildroot}%{_root_sysconfdir}/rpm/macros.%{scl}-config # Move in correct location, if needed @@ -238,7 +238,7 @@ restorecon -R %{_localstatedir} &>/dev/null || : %license LICENSE %doc README %scl_files -%{_mandir}/man7/%{scl_name}.* +%{_root_mandir}/man7/%{scl_name}.* %{?_licensedir:%{_datadir}/licenses} %{_datadir}/tests %if ! %{with_modules} @@ -268,6 +268,12 @@ restorecon -R %{_localstatedir} &>/dev/null || : %changelog +* Tue Jun 20 2023 Remi Collet 7.1-1 +- define %%scl_vendor and %%_scl_prefix in macros.php71-config +- redefine %%__phpize and %%__phpconfig +- move man page out of scl tree +- improve the man page + * Wed Feb 20 2019 Remi Collet 2.0-1 - add syspaths sub package providing system-wide wrappers -- cgit