--- rpms/e-smith-php/sme8/e-smith-php.spec	2008/04/28 23:21:29	1.2
+++ rpms/e-smith-php/sme8/e-smith-php.spec	2011/09/19 10:06:54	1.11
@@ -1,16 +1,19 @@
+# $Id: e-smith-php.spec,v 1.10 2011/09/17 20:05:54 snetram Exp $
+
 Summary: e-smith specific PHP configuration and templates.
 %define name e-smith-php
 Name: %{name}
-%define version 1.12.0
+%define version 2.2.0
 %define release 5
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.gz
-Patch0: e-smith-php-1.12.0-php5.patch
-Patch1: e-smith-php-1.12.0-lib64.patch
-Patch2: e-smith-php-1.12.0-SplitModuleSettingSection.patch
+Patch0: e-smith-php-2.2.0-obsoleteMagicQuotes.patch
+Patch1: e-smith-php-2.2.0-exposephp.patch
+Patch2: e-smith-php-2.2.0-addTimeZone.patch
+Patch3: e-smith-php-2.2.0-remove-magic-quotes.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: e-smith-base, php >= 4.0.1
@@ -19,6 +22,30 @@ BuildRequires: e-smith-devtools >= 1.11.
 AutoReqProv: no
 
 %changelog
+* Mon Sep 19 2011 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-5.sme
+- Obsolete magic_quotes settings [SME: 6725]
+
+* Sat Sep 17 2011 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-4.sme
+- Set default timezone [SME: 6716]
+
+* Mon Jul 19 2010 Ian Wells <esmith@wellsi.com> 2.2.0-3.sme
+- Default expose_php in php.ini to Off [SME: 6136]
+
+* Sun Mar 14 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-2.sme
+- Prepare for obsoletion of magic_quotes* when we supply PHP 5.3.0+ [SME: 5843]
+
+* Tue Oct 7 2008 Shad L. Lords <slords@mail.com> 2.2.0-1.sme
+- Roll new stream to separate sme7/sme8 trees [SME: 4633]
+
+* Wed Aug 20 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.12.0-8
+- Fix latest patches to prevent .orig file [SME: 4513]
+
+* Wed Aug 20 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.12.0-7
+- Fix some minor layout issues introduced by fixes in [SME: 4513]
+
+* Tue Aug 19 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.12.0-6
+- Fix whiteline and spacing issues [SME: 4513]
+
 * Fri Apr 18 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.12.0-5
 - Split 80ModuleSettings template fragmenent to have one frament per module [SME: 3282]
 
@@ -311,9 +338,10 @@ php specific configuration items.
 
 %prep
 %setup
-%patch0 -p 1
-%patch1 -p 1
-%patch2 -p 1
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 perl createlinks