summaryrefslogtreecommitdiffstats
path: root/php55.spec
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2013-05-23 16:14:51 +0200
committerRemi Collet <fedora@famillecollet.com>2013-05-23 16:14:51 +0200
commit61ec3ced0b3e258c8c0dfcca4e0d3049d2f7a1c6 (patch)
tree5478c0c51a3dc8eee9b4cfdd1d7b20ae88410cf8 /php55.spec
parent1f6127754d44fd20ff32ffa33e8ff6995acad9ac (diff)
php: minor changes from rawhide
Diffstat (limited to 'php55.spec')
-rw-r--r--php55.spec7
1 files changed, 7 insertions, 0 deletions
diff --git a/php55.spec b/php55.spec
index c20ebe8..0d48a54 100644
--- a/php55.spec
+++ b/php55.spec
@@ -1450,6 +1450,10 @@ install -m 755 -d $RPM_BUILD_ROOT/run/php-fpm
install -m 755 -d $RPM_BUILD_ROOT%{_prefix}/lib/tmpfiles.d
install -m 644 php-fpm.tmpfiles $RPM_BUILD_ROOT%{_prefix}/lib/tmpfiles.d/php-fpm.conf
# install systemd unit files and scripts for handling server startup
+%if 0%{?fedora} >= 19 || 0%{?rhel} >= 7
+# this folder requires systemd >= 204
+install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/systemd/system/php-fpm.service.d
+%endif
install -m 755 -d $RPM_BUILD_ROOT%{_unitdir}
install -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{_unitdir}/
%if 0%{?fedora} < 16 && 0%{?rhel} < 7
@@ -1739,6 +1743,9 @@ fi
%if %{with_systemd}
%{_prefix}/lib/tmpfiles.d/php-fpm.conf
%{_unitdir}/php-fpm.service
+%if 0%{?fedora} >= 19 || 0%{?rhel} >= 7
+%dir %{_sysconfdir}/systemd/system/php-fpm.service.d
+%endif
%dir /run/php-fpm
%else
%{_initrddir}/php-fpm