From c4f79b9fa4bf482b8252099fbf6c303a594a48f0 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 9 Mar 2023 11:57:26 +0100 Subject: define %scl_vendor and %_scl_prefix in macros.php81-config move man page out of scl tree improve the man page --- php82.spec | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'php82.spec') diff --git a/php82.spec b/php82.spec index 4489335..f2ae82e 100644 --- a/php82.spec +++ b/php82.spec @@ -26,7 +26,7 @@ Summary: Package that installs PHP 8.2 Name: %scl_name Version: 8.2 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Source0: macros-build @@ -174,7 +174,7 @@ help2man -N --section 7 ./h2m_helper -o %{scl_name}.7 install -D -m 644 enable %{buildroot}%{_scl_scripts}/enable install -D -m 644 envmod %{buildroot}%{_root_datadir}/Modules/modulefiles/%{scl_name} 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 @@ -186,7 +186,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 @@ -233,7 +233,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 %{_root_datadir}/Modules/modulefiles/%{scl_name} @@ -259,6 +259,11 @@ restorecon -R %{_localstatedir} &>/dev/null || : %changelog +* Thu Mar 9 2023 Remi Collet 8.2-3 +- define %%scl_vendor and %%_scl_prefix in macros.php81-config +- move man page out of scl tree +- improve the man page + * Wed Jun 22 2022 Remi Collet 8.2-2 - php82-syspaths conflicts with php81-syspaths -- cgit