--- rpms/php5-cgi/contribs7/php5-cgi.spec	2009/03/04 19:31:30	1.2
+++ rpms/php5-cgi/contribs7/php5-cgi.spec	2009/11/03 06:26:30	1.3
@@ -1,4 +1,4 @@
-# $Id: php5-cgi.spec,v 1.1 2009/03/04 17:04:43 slords Exp $
+# $Id: php5-cgi.spec,v 1.2 2009/03/04 19:31:30 slords Exp $
 # Authority: ????
 # Name: David Harper
 
@@ -15,7 +15,7 @@
 Summary: The PHP HTML-embedded scripting language. (PHP: Hypertext Preprocessor)
 Name: php5-cgi
 Version: 5.2.8
-Release: 1%{?dist}
+Release: 2%{?dist}
 %{?rh90:Epoch: 1 }
 License: The PHP License
 Group: Development/Languages
@@ -57,7 +57,7 @@ BuildRequires: bzip2, fileutils, perl, l
 %{?_with_tidy:BuildRequires: tidy}
 %{?_with_tidy:Requires: tidy}
 
-Obsoletes: php-dbg, mod_php, php3, phpfi, stronghold-php, php-xslt
+Obsoletes: php-dbg, php3, phpfi, stronghold-php, php-xslt
 # Enforce Apache module ABI compatibility
 Requires: httpd-mmn = %(cat %{_includedir}/httpd/.mmn || echo missing-httpd-devel)
 Requires: php5-cgi-pear
@@ -378,6 +378,8 @@ ln -sf ../configure
 	--with-png-dir=%{_prefix} \
 	--with-gd \
 	--enable-gd-native-ttf \
+	--enable-mbstring \
+	--with-mysqli=/usr/bin/mysql_config \
 	--without-gdbm \
 	--with-gettext \
 	--with-ncurses \
@@ -554,13 +556,13 @@ rm files.*
 %{_libdir}/php5/build
 
 %files pgsql -f files.pgsql
-%{_libdir}/php5/pgsql.so
+#%{_libdir}/php5/pgsql.so
 
 %files mysql -f files.mysql
-%{_libdir}/php5/mysql.so
+#%{_libdir}/php5/mysql.so
 
 %files odbc -f files.odbc
-%{_libdir}/php5/odbc.so
+#%{_libdir}/php5/odbc.so
 
 %if %{with_oci8}
 %files oci8 -f files.oci8
@@ -579,25 +581,44 @@ rm files.*
 %endif
 
 %files imap -f files.imap
-%{_libdir}/php5/imap.so
+# %{_libdir}/php5/imap.so
 
 %files ldap -f files.ldap
-%{_libdir}/php5/ldap.so
+# %{_libdir}/php5/ldap.so
 
 %files snmp -f files.snmp
-%{_libdir}/php5/snmp.so
+# %{_libdir}/php5/snmp.so
 
 %files xmlrpc -f files.xmlrpc
-%{_libdir}/php5/xmlrpc.so
+# %{_libdir}/php5/xmlrpc.so
 
 %if %{with_mbstring}
 %files mbstring -f files.mbstring
 %endif
 
 %changelog
+* Tue Nov 3 2009 Marco Hess <marco.hess@through-ip.com) 5.2.8-2
+- Porting David Harper's <davidiwharper@hotmail.com> changes and updates
+  to SME Contribs CVS repository and build system. Leave 5.3.0 upgrade
+  for now, but ported:
+  - Fix for PHP4 compatibility issues [SME: 5463]
+  - Add MySQLi support
+  - Re-add mbstring support
+  - Misc. build fixes for CentOS/SME
+  
+* Thu Sep 17 2009 David Harper <davidiwharper@hotmail.com> 5.3.0-2.el4
+- Fix for PHP4 compatibility issues [SME: 5463]
+
+* Sun Sep 6 2009 David Harper <davidiwharper@hotmail.com> 5.3.0-1.el4
+- Upgrade to the latest version of PHP [SME: 5376]
+- Add MySQLi support
+- Re-add mbstring support
+- Misc. build fixes for CentOS/SME
+
 * Mon Jan 12 2009 David Harper <davidiwharper@hotmail.com> 5.2.8-1.dh
 - Upgrade to latest version of PHP
 - Build fixes for CentOS/SME
+
 * Fri Jan 20 2006 Stuart K. Low <stuart@serverpeak.com> 5.1.2-1
 - Mass upgrade
 - Added rhel4 flags