[php] update to 5.4.4, use /usr/lib/tmpfiles.d/php-fpm and /run/php-fpm

[Remi Collet]

commit 922e10e22d057cb45cff640f174b1dccc9b24cea
Author: remi <fedora at famillecollet.com>
Date:   Thu Jun 14 18:17:45 2012 +0200

    update to 5.4.4, use /usr/lib/tmpfiles.d/php-fpm and /run/php-fpm

 .gitignore        |   11 +----------
 php-fpm.conf      |    2 +-
 php-fpm.logrotate |    2 +-
 php-fpm.service   |    2 +-
 php.spec          |   19 ++++++++++++-------
 sources           |    2 +-
 6 files changed, 17 insertions(+), 21 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8f1d973..7d97410 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,2 @@
 php.spec~
-/php-5.3.7.tar.bz2
-/php-5.3.8.tar.bz2
-/php-5.4.0RC6.tar.bz2
-/php-5.4.0RC7.tar.bz2
-/php-5.4.0RC8.tar.bz2
-/php-5.4.0.tar.bz2
-/php-5.?.?
-/php-5.4.1.tar.bz2
-/php-5.4.2.tar.bz2
-/php-5.4.3.tar.bz2
+/php-5.4.4.tar.bz2
diff --git a/php-fpm.conf b/php-fpm.conf
index a243fa0..49b9af3 100644
--- a/php-fpm.conf
+++ b/php-fpm.conf
@@ -17,7 +17,7 @@ include=/etc/php-fpm.d/*.conf
 [global]
 ; Pid file
 ; Default Value: none
-pid = /var/run/php-fpm/php-fpm.pid
+pid = /run/php-fpm/php-fpm.pid
 
 ; Error log file
 ; Default Value: /var/log/php-fpm.log
diff --git a/php-fpm.logrotate b/php-fpm.logrotate
index a8cfbc8..25f9feb 100644
--- a/php-fpm.logrotate
+++ b/php-fpm.logrotate
@@ -4,6 +4,6 @@
     sharedscripts
     delaycompress
     postrotate
-	/bin/kill -SIGUSR1 `cat /var/run/php-fpm/php-fpm.pid 2>/dev/null` 2>/dev/null || true
+	/bin/kill -SIGUSR1 `cat /run/php-fpm/php-fpm.pid 2>/dev/null` 2>/dev/null || true
     endscript
 }
diff --git a/php-fpm.service b/php-fpm.service
index df24fb7..5aaaf3f 100644
--- a/php-fpm.service
+++ b/php-fpm.service
@@ -4,7 +4,7 @@ After=syslog.target network.target
 
 [Service]
 Type=forking
-PIDFile=/var/run/php-fpm/php-fpm.pid
+PIDFile=/run/php-fpm/php-fpm.pid
 EnvironmentFile=/etc/sysconfig/php-fpm
 ExecStart=/usr/sbin/php-fpm
 ExecReload=/bin/kill -USR2 $MAINPID
diff --git a/php.spec b/php.spec
index a224e69..38c81be 100644
--- a/php.spec
+++ b/php.spec
@@ -55,7 +55,7 @@
 
 Summary: PHP scripting language for creating dynamic web sites
 Name: php
-Version: 5.4.3
+Version: 5.4.4
 Release: 1%{?dist}
 License: PHP
 Group: Development/Languages
@@ -667,7 +667,7 @@ find . -name \*.[ch] -exec chmod 644 {} \;
 chmod 644 README.*
 
 # php-fpm configuration files for tmpfiles.d
-echo "d %{_localstatedir}/run/php-fpm 755 root root" >php-fpm.tmpfiles
+echo "d /run/php-fpm 755 root root" >php-fpm.tmpfiles
 
 
 %build
@@ -1031,15 +1031,15 @@ install -m 700 -d $RPM_BUILD_ROOT%{_localstatedir}/lib/php/session
 # PHP-FPM stuff
 # Log
 install -m 755 -d $RPM_BUILD_ROOT%{_localstatedir}/log/php-fpm
-install -m 755 -d $RPM_BUILD_ROOT%{_localstatedir}/run/php-fpm
+install -m 755 -d $RPM_BUILD_ROOT/run/php-fpm
 # Config
 install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/php-fpm.d
 install -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/php-fpm.conf
 install -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/php-fpm.d/www.conf
 mv $RPM_BUILD_ROOT%{_sysconfdir}/php-fpm.conf.default .
 # tmpfiles.d
-install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d
-install -m 644 php-fpm.tmpfiles $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d/php-fpm.conf
+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
 install -m 755 -d $RPM_BUILD_ROOT%{_unitdir}
 install -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{_unitdir}/
@@ -1219,13 +1219,13 @@ fi
 %config(noreplace) %{_sysconfdir}/php-fpm.d/www.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/php-fpm
 %config(noreplace) %{_sysconfdir}/sysconfig/php-fpm
-%config(noreplace) %{_sysconfdir}/tmpfiles.d/php-fpm.conf
+%{_prefix}/lib/tmpfiles.d/php-fpm.conf
 %{_unitdir}/php-fpm.service
 %{_sbindir}/php-fpm
 %dir %{_sysconfdir}/php-fpm.d
 # log owned by apache for log
 %attr(770,apache,root) %dir %{_localstatedir}/log/php-fpm
-%dir %{_localstatedir}/run/php-fpm
+%dir /run/php-fpm
 %{_mandir}/man8/php-fpm.8*
 %{_datadir}/fpm/status.html
 %endif
@@ -1278,6 +1278,11 @@ fi
 
 
 %changelog
+* Thu Jun 14 2012 Remi Collet <remi at fedoraproject.org> 5.4.4-1
+- update to 5.4.4 finale
+- use /usr/lib/tmpfiles.d instead of /etc/tmpfiles.d
+- use /run/php-fpm instead of /var/run/php-fpm
+
 * Wed May 09 2012 Remi Collet <remi at fedoraproject.org> 5.4.3-1
 - update to 5.4.3 (CVE-2012-2311, CVE-2012-2329)
 
diff --git a/sources b/sources
index c2792c8..8c8ebd4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-51f9488bf8682399b802c48656315cac  php-5.4.3.tar.bz2
+1fd98dc3f6f3805cd67bff12a26ed77f  php-5.4.4.tar.bz2