From d00ab811ca18de43c17ce40b3c0ff390b5747c82 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Thu, 22 Jan 2015 07:42:14 +0100
Subject: [PATCH] - Update to 5.6.5 http://www.php.net/releases/5_6_5.php -
 drop deprecated php-fpm EnvironmentFile

---
 .gitignore        |  1 +
 php-fpm.service   |  9 ++++++---
 php-fpm.sysconfig | 13 -------------
 php.spec          | 16 ++++++++--------
 sources           |  2 +-
 5 files changed, 16 insertions(+), 25 deletions(-)
 delete mode 100644 php-fpm.sysconfig

diff --git a/.gitignore b/.gitignore
index 74ccc4e..9ec2b1e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,3 +38,4 @@ php-5.5.*.xz
 /php-5.6.4RC1-strip.tar.xz
 /php-5.6.4-strip.tar.xz
 /php-5.6.5RC1-strip.tar.xz
+/php-5.6.5-strip.tar.xz
diff --git a/php-fpm.service b/php-fpm.service
index 41f6bfe..a5969ea 100644
--- a/php-fpm.service
+++ b/php-fpm.service
@@ -1,6 +1,10 @@
 # It's not recommended to modify this file in-place, because it will be
-# overwritten during package upgrades.  If you want to customize, the
-# best way is to create a file "/etc/systemd/system/php-fpm.service".
+# overwritten during package upgrades.
+
+# To alter the FPM environment, drop a file with the suffix
+# .conf in /etc/systemd/system/php-fpm.service.d, with
+#     [Service]
+#     Environment=FOO=bar
 
 [Unit]
 Description=The PHP FastCGI Process Manager
@@ -9,7 +13,6 @@ After=syslog.target network.target
 [Service]
 Type=notify
 PIDFile=/run/php-fpm/php-fpm.pid
-EnvironmentFile=/etc/sysconfig/php-fpm
 ExecStart=/usr/sbin/php-fpm --nodaemonize
 ExecReload=/bin/kill -USR2 $MAINPID
 PrivateTmp=true
diff --git a/php-fpm.sysconfig b/php-fpm.sysconfig
deleted file mode 100644
index bdb1f6b..0000000
--- a/php-fpm.sysconfig
+++ /dev/null
@@ -1,13 +0,0 @@
-# Additional environment file for php-fpm
-
-# This file is deprecated and will be removed in the future
-
-# To alter the FPM environment, drop a file with the suffix
-# .conf in /etc/systemd/system/php-fpm.service.d, with
-#     [Service]
-#     Environment=FOO=bar
-
-# See systemd documentation:
-#    man systemd.unit
-#    man systemd.exec
-
diff --git a/php.spec b/php.spec
index e148d30..9218b53 100644
--- a/php.spec
+++ b/php.spec
@@ -57,12 +57,12 @@
 %global db_devel  libdb-devel
 %endif
 
-%global rcver         RC1
+#global rcver         RC1
 
 Summary: PHP scripting language for creating dynamic web sites
 Name: php
 Version: 5.6.5
-Release: 0.1.RC1%{?dist}
+Release: 1%{?dist}
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
 # TSRM is licensed under BSD
@@ -81,7 +81,6 @@ Source4: php-fpm.conf
 Source5: php-fpm-www.conf
 Source6: php-fpm.service
 Source7: php-fpm.logrotate
-Source8: php-fpm.sysconfig
 Source9: php.modconf
 Source10: php.ztsmodconf
 Source11: strip.sh
@@ -1208,9 +1207,6 @@ install -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{_unitdir}/
 # LogRotate
 install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
 install -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/php-fpm
-# Environment file
-install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
-install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/php-fpm
 # Nginx configuration
 install -D -m 644 %{SOURCE13} $RPM_BUILD_ROOT%{_sysconfdir}/nginx/conf.d/php-fpm.conf
 install -D -m 644 %{SOURCE14} $RPM_BUILD_ROOT%{_sysconfdir}/nginx/default.d/php.conf
@@ -1406,7 +1402,6 @@ rm -f README.{Zeus,QNX,CVS-RULES}
 %config(noreplace) %{_sysconfdir}/php-fpm.conf
 %config(noreplace) %{_sysconfdir}/php-fpm.d/www.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/php-fpm
-%config(noreplace) %{_sysconfdir}/sysconfig/php-fpm
 %config(noreplace) %{_sysconfdir}/nginx/conf.d/php-fpm.conf
 %config(noreplace) %{_sysconfdir}/nginx/default.d/php.conf
 %{_prefix}/lib/tmpfiles.d/php-fpm.conf
@@ -1478,7 +1473,12 @@ rm -f README.{Zeus,QNX,CVS-RULES}
 
 
 %changelog
-* Fri Jan 9 2015 Remi Collet <remi@fedoraproject.org> 5.6.5-0.1.RC1
+* Thu Jan 22 2015 Remi Collet <remi@fedoraproject.org> 5.6.5-1
+- Update to 5.6.5
+  http://www.php.net/releases/5_6_5.php
+- drop deprecated php-fpm EnvironmentFile
+
+* Fri Jan  9 2015 Remi Collet <remi@fedoraproject.org> 5.6.5-0.1.RC1
 - update to 5.6.5RC1
 - FPM: enable ACL support for Unix Domain Socket
 - FPM: switch default configuration to use UDS
diff --git a/sources b/sources
index eec9556..4d2f11d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-76f79df8abd9d30b526e1c3ae317c86f  php-5.6.5RC1-strip.tar.xz
+0bb0becc5b22d5565fe11e755ea9ddf5  php-5.6.5-strip.tar.xz