--- rpms/e-smith-php/sme8/e-smith-php.spec	2007/06/12 19:18:24	1.1
+++ rpms/e-smith-php/sme8/e-smith-php.spec	2010/03/14 08:53:44	1.7
@@ -1,15 +1,16 @@
+# $Id: e-smith-php.spec,v 1.6 2008/10/07 18:51:15 slords Exp $
+
 Summary: e-smith specific PHP configuration and templates.
 %define name e-smith-php
 Name: %{name}
-%define version 1.12.0
-%define release 4
+%define version 2.2.0
+%define release 2
 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
+Patch0: e-smith-php-2.2.0-obsoleteMagicQuotes.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: e-smith-base, php >= 4.0.1
@@ -18,6 +19,24 @@ BuildRequires: e-smith-devtools >= 1.11.
 AutoReqProv: no
 
 %changelog
+* Sat Mar 13 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]
+
 * Fri May 18 2007 Shad L. Lords <slords@mail.com> 1.12.0-4
 - Use correct lib for modules
 
@@ -307,8 +326,7 @@ php specific configuration items.
 
 %prep
 %setup
-%patch0 -p 1
-%patch1 -p 1
+%patch0 -p1
 
 %build
 perl createlinks