--- rpms/e-smith-php/sme9/e-smith-php.spec	2014/05/08 07:26:34	1.3
+++ rpms/e-smith-php/sme9/e-smith-php.spec	2015/06/29 11:51:59	1.5
@@ -1,17 +1,18 @@
-# $Id: e-smith-php.spec,v 1.2 2013/05/19 16:24:05 wellsi Exp $
+# $Id: e-smith-php.spec,v 1.4 2014/11/14 18:33:46 charliebrady Exp $
 
 Summary: e-smith specific PHP configuration and templates.
 %define name e-smith-php
 Name: %{name}
 %define version 2.4.0
-%define release 3
+%define release 5
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.xz
 Patch1: e-smith-php-2.4.0-magic-quotes-off.patch
-Patch2: e-smith-php-2.4.0_add_upload_tmp_folder.patch
+#Patch2: e-smith-php-2.4.0_add_upload_tmp_folder.patch
+Patch3: e-smith-php-2.4.0-gpc_order.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: e-smith-base, php >= 4.0.1
@@ -20,8 +21,14 @@ BuildRequires: e-smith-devtools >= 1.11.
 AutoReqProv: no
 
 %changelog
+* Mon Jun 29 2015 stephane de Labrusse <stephdl@de-labrusse.fr> 2.4.0-5
+- revert the e-smith-php-2.4.0_add_upload_tmp_folder.patch [SME: 7011]
+
+* Fri Nov 14 2014 Charlie Brady <charlie_brady@mitel.com> 2.4.0-4.sme
+- Remove obsolete gpc_order setting from php.ini. [SME: 8652]
+
 * Sat May 4 2014 stephane de Labrusse <stephdl@de-labrusse.fr> 2.4.0-3.sme
-- Add an upload_tmp_folder setting by db command [sme: 7011]
+- Add an upload_tmp_folder setting by db command [SME: 7011]
 - Thanks to Michael McCarn and Jean-philippe Pialasse
 
 * Sun May 19 2013 Ian Wells <esmith@wellsi.com> 2.4.0-2.sme
@@ -350,7 +357,9 @@ php specific configuration items.
 %prep
 %setup
 %patch1 -p1
-%patch2 -p1
+#%patch2 -p1
+%patch3 -p1
+
 %build
 perl createlinks