From 804b768e9f94666b3d88a164231b9ba8c559451e Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Tue, 20 Jan 2015 14:04:59 +0100
Subject: php54-php: fix php-fpm.service.d location

---
 php.spec | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'php.spec')

diff --git a/php.spec b/php.spec
index c35f8f6..2fa0fce 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: 5.4.36
-Release: 1%{?dist}.1
+Release: 1%{?dist}.2
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
 # TSRM is licensed under BSD
@@ -1205,11 +1205,12 @@ mv $RPM_BUILD_ROOT%{_sysconfdir}/php-fpm.conf.default .
 install -m 755 -d $RPM_BUILD_ROOT%{_unitdir}
 install -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{_unitdir}/%{?scl_prefix}php-fpm.service
 sed -e 's:/run:%{_localstatedir}/run:' \
-    -e 's:/etc:%{_sysconfdir}:' \
+    -e 's:/etc/sysconfig:%{_sysconfdir}/sysconfig:' \
+    -e 's:php-fpm.service:%{?scl_prefix}php-fpm.service:' \
     -e 's:/usr/sbin:%{_sbindir}:' \
     -i $RPM_BUILD_ROOT%{_unitdir}/%{?scl_prefix}php-fpm.service
 # this folder requires systemd >= 204
-install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/systemd/system/%{?scl_prefix}php-fpm.service.d
+install -m 755 -d $RPM_BUILD_ROOT%{_root_sysconfdir}/systemd/system/%{?scl_prefix}php-fpm.service.d
 %else
 # Service
 install -m 755 -d $RPM_BUILD_ROOT%{_root_initddir}
@@ -1229,9 +1230,12 @@ install -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_root_sysconfdir}/logrotate.d/%{?scl_
 sed -e 's:/run:%{_localstatedir}/run:' \
     -e 's:/var/log:%{_localstatedir}/log:' \
     -i $RPM_BUILD_ROOT%{_root_sysconfdir}/logrotate.d/%{?scl_prefix}php-fpm
+
 # Environment file
 install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
 install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/php-fpm
+sed -e 's:php-fpm.service:%{?scl_prefix}php-fpm.service:' \
+    -i $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/php-fpm
 
 # Fix the link
 (cd $RPM_BUILD_ROOT%{_bindir}; ln -sfn phar.phar phar)
@@ -1495,7 +1499,7 @@ fi
 %config(noreplace) %{_sysconfdir}/sysconfig/php-fpm
 %if %{with_systemd}
 %{_unitdir}/%{?scl_prefix}php-fpm.service
-%dir %{_sysconfdir}/systemd/system/%{?scl_prefix}php-fpm.service.d
+%dir %{_root_sysconfdir}/systemd/system/%{?scl_prefix}php-fpm.service.d
 %else
 %{_root_initddir}/%{?scl_prefix}php-fpm
 %endif
@@ -1582,6 +1586,9 @@ fi
 
 
 %changelog
+* Tue Jan 20 2015 Remi Collet <rcollet@redhat.com> 5.4.36-1.2
+- fix php-fpm.service.d location
+
 * Mon Dec 22 2014 Remi Collet <remi@fedoraproject.org> 5.4.36-1.1
 - allow multiple paths in ini_scan_dir, backported from 5.5
   and applied in RHSCL packages
-- 
cgit