summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2019-02-20 12:29:51 +0100
committerRemi Collet <remi@remirepo.net>2019-02-20 12:29:51 +0100
commit780e979900cf8f6859a87f8004072845404c7693 (patch)
tree938ede64f49cdc839bb2120b23812e310d5f1aba
parent1f68b1504fbf34be453a0791248545878d8e0fd8 (diff)
add syspaths sub package providing system-wide wrappers
-rw-r--r--php71.spec59
1 files changed, 56 insertions, 3 deletions
diff --git a/php71.spec b/php71.spec
index 376ea90..70854cd 100644
--- a/php71.spec
+++ b/php71.spec
@@ -33,8 +33,8 @@
Summary: Package that installs PHP 7.1
Name: %scl_name
-Version: 1.0
-Release: 3%{?dist}
+Version: 2.0
+Release: 1%{?dist}
Group: Development/Languages
License: GPLv2+
@@ -93,6 +93,31 @@ Package shipping development files, especially usefull for development of
packages depending on %scl Software Collection.
+%package syspaths
+Summary: System-wide wrappers for the %{name} package
+Requires: %{?scl_name}-runtime%{?_isa} = %{version}-%{release}
+Requires: %{?scl_name}-php-cli%{?_isa}
+Requires: %{?scl_name}-php-common%{?_isa}
+Conflicts: php-common
+Conflicts: php-cli
+Conflicts: php54-syspaths
+Conflicts: php55-syspaths
+Conflicts: php56-syspaths
+Conflicts: php70-syspaths
+Conflicts: php72-syspaths
+Conflicts: php73-syspaths
+
+%description syspaths
+System-wide wrappers for the %{name}-php-cli package.
+
+Using the %{name}-syspaths package does not require running the
+'scl enable' or 'module command. This package practically replaces the system
+default php-cli package. It provides the php, phar and php-cgi commands.
+
+Note that the php-cli and %{name}-syspaths packages conflict and cannot
+be installed on one system.
+
+
%prep
%setup -c -T
@@ -174,6 +199,19 @@ if [ "%{_root_sysconfdir}/rpm" != "%{macrosdir}" ]; then
%{buildroot}%{macrosdir}/macros.%{scl}-config
fi
+# syspaths
+mkdir -p %{buildroot}%{_root_sysconfdir}
+ln -s %{_sysconfdir}/php.ini %{buildroot}%{_root_sysconfdir}/php.ini
+ln -s %{_sysconfdir}/php.d %{buildroot}%{_root_sysconfdir}/php.d
+mkdir -p %{buildroot}%{_root_bindir}
+ln -s %{_bindir}/php %{buildroot}%{_root_bindir}/php
+ln -s %{_bindir}/phar %{buildroot}%{_root_bindir}/phar
+ln -s %{_bindir}/php-cgi %{buildroot}%{_root_bindir}/php-cgi
+mkdir -p %{buildroot}%{_root_mandir}/man1
+ln -s %{_mandir}/man1/php.1.gz %{buildroot}%{_root_mandir}/man1/php.1.gz
+ln -s %{_mandir}/man1/phar.1.gz %{buildroot}%{_root_mandir}/man1/phar.1.gz
+ln -s %{_mandir}/man1/php-cgi.1.gz %{buildroot}%{_root_mandir}/man1/php-cgi.1.gz
+
%post runtime
# Simple copy of context from system root to SCL root.
@@ -217,8 +255,23 @@ restorecon -R %{_localstatedir} &>/dev/null || :
%defattr(-,root,root)
%{macrosdir}/macros.%{scl_name_base}-scldevel
+
+%files syspaths
+%{_root_sysconfdir}/php.ini
+%{_root_sysconfdir}/php.d
+%{_root_bindir}/php
+%{_root_bindir}/phar
+%{_root_bindir}/php-cgi
+%{_root_mandir}/man1/php.1.gz
+%{_root_mandir}/man1/phar.1.gz
+%{_root_mandir}/man1/php-cgi.1.gz
+
+
%changelog
-* Fri Jan 19 2019 Remi Collet <remi@remirepo.net> 1.0-3
+* Wed Feb 20 2019 Remi Collet <remi@remirepo.net> 2.0-1
+- add syspaths sub package providing system-wide wrappers
+
+* Fri Jan 18 2019 Remi Collet <remi@remirepo.net> 1.0-3
- cleanup for EL-8
* Thu Aug 23 2018 Remi Collet <remi@remirepo.net> 1.0-2