--- rpms/e-smith-php/sme8/e-smith-php.spec	2008/08/20 16:55:14	1.4
+++ rpms/e-smith-php/sme8/e-smith-php.spec	2010/07/19 20:57:37	1.9
@@ -1,18 +1,17 @@
+# $Id: e-smith-php.spec,v 1.8 2010/03/14 08:59:35 snetram Exp $
+
 Summary: e-smith specific PHP configuration and templates.
 %define name e-smith-php
 Name: %{name}
-%define version 1.12.0
-%define release 7
+%define version 2.2.0
+%define release 3
 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
-Patch3: e-smith-php-1.12.0-fixWhiteLines.patch
-Patch4: e-smith-php-1.12.0-fixSpacing.patch
+Patch0: e-smith-php-2.2.0-obsoleteMagicQuotes.patch
+Patch1: e-smith-php-2.2.0-exposephp.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: e-smith-base, php >= 4.0.1
@@ -21,6 +20,18 @@ BuildRequires: e-smith-devtools >= 1.11.
 AutoReqProv: no
 
 %changelog
+* 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]
 
@@ -319,11 +330,8 @@ php specific configuration items.
 
 %prep
 %setup
-%patch0 -p 1
-%patch1 -p 1
-%patch2 -p 1
-%patch3 -p 1
-%patch4 -p 1
+%patch0 -p1
+%patch1 -p1
 
 %build
 perl createlinks