From 1bb33d3e53e0b10017f15253c1a6bb31a0e76514 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 8 Dec 2020 09:31:22 +0100
Subject: fix service dependency name add dependency on make for devel

---
 php-fpm.wants | 2 +-
 php.spec      | 9 ++++++++-
 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 17a138a..d4524c2 100644
--- a/php.spec
+++ b/php.spec
@@ -106,7 +106,7 @@
 Summary: PHP scripting language for creating dynamic web sites
 Name:    %{?scl_prefix}php
 Version: %{upver}%{?rcver:~%{rcver}}%{?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
@@ -198,6 +198,7 @@ BuildRequires: bzip2
 BuildRequires: perl
 BuildRequires: autoconf
 BuildRequires: automake
+BuildRequires: make
 BuildRequires: %{?dtsprefix}gcc
 BuildRequires: %{?dtsprefix}gcc-c++
 BuildRequires: libtool
@@ -390,6 +391,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
@@ -1420,6 +1422,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:' \
@@ -1810,6 +1813,10 @@ fi
 
 
 %changelog
+* Tue Dec  8 2020 Remi Collet <remi@remirepo.net> - 7.4.13-2
+- fix service dependency name
+- add dependency on make for devel
+
 * Tue Nov 24 2020 Remi Collet <remi@remirepo.net> - 7.4.13-1
 - Update to 7.4.13 - http://www.php.net/releases/7_4_13.php
 - use oracle client library version 19.9 (x86_64)
-- 
cgit