summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--php-fpm.wants2
-rw-r--r--php.spec9
2 files changed, 9 insertions, 2 deletions
diff --git a/php-fpm.wants b/php-fpm.wants
index 18fa4b1..5c7c8e4 100644
--- a/php-fpm.wants
+++ b/php-fpm.wants
@@ -1,3 +1,3 @@
[Unit]
-Wants=php73-php-fpm.service
+Wants=php-fpm.service
diff --git a/php.spec b/php.spec
index c9cb068..0fcbd09 100644
--- a/php.spec
+++ b/php.spec
@@ -109,7 +109,7 @@
Summary: PHP scripting language for creating dynamic web sites
Name: %{?scl_prefix}php
Version: %{upver}%{?lower:~%{lower}}%{?gh_date:.%{gh_date}}
-Release: 1%{?dist}
+Release: 2%{?dist}
# All files licensed under PHP version 3.01, except
# Zend is licensed under Zend
# TSRM is licensed under BSD
@@ -203,6 +203,7 @@ BuildRequires: bzip2
BuildRequires: perl
BuildRequires: autoconf
BuildRequires: automake
+BuildRequires: make
BuildRequires: %{?dtsprefix}gcc
BuildRequires: %{?dtsprefix}gcc-c++
BuildRequires: libtool
@@ -386,6 +387,7 @@ Requires: %{?scl_prefix}php-cli%{?_isa} = %{version}-%{release}
# always needed to build extension
Requires: autoconf
Requires: automake
+Requires: make
Requires: gcc
Requires: gcc-c++
Requires: libtool
@@ -1417,6 +1419,7 @@ install -Dm 644 %{SOURCE6} $RPM_BUILD_ROOT%{_unitdir}/%{?scl_prefix}php-fpm.ser
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
install -Dm 644 %{SOURCE12} $RPM_BUILD_ROOT%{_unitdir}/httpd.service.d/%{?scl_prefix}php-fpm.conf
install -Dm 644 %{SOURCE12} $RPM_BUILD_ROOT%{_unitdir}/nginx.service.d/%{?scl_prefix}php-fpm.conf
+sed -e 's/php-fpm/%{?scl_prefix}php-fpm/' -i $RPM_BUILD_ROOT%{_unitdir}/*.service.d/%{?scl_prefix}php-fpm.conf
%endif
sed -e 's:/run:%{_localstatedir}/run:' \
-e 's:/etc/sysconfig:%{_sysconfdir}/sysconfig:' \
@@ -1804,6 +1807,10 @@ fi
%changelog
+* Tue Dec 8 2020 Remi Collet <remi@remirepo.net> - 8.0.0-2
+- fix service dependency name
+- add dependency on make for devel
+
* Wed Nov 25 2020 Remi Collet <remi@remirepo.net> - 8.0.0-1
- update to 8.0.0 GA