--- rpms/php5-cgi/contribs7/php5-cgi.spec	2009/03/04 19:31:30	1.2
+++ rpms/php5-cgi/contribs7/php5-cgi.spec	2010/03/04 16:15:36	1.5
@@ -1,5 +1,5 @@
-# $Id: php5-cgi.spec,v 1.1 2009/03/04 17:04:43 slords Exp $
-# Authority: ????
+# $Id: php5-cgi.spec,v 1.2 2009/03/04 19:31:30 slords Exp $
+# Authority: nocvs
 # Name: David Harper
 
 %define rhel4 1
@@ -14,8 +14,8 @@
 
 Summary: The PHP HTML-embedded scripting language. (PHP: Hypertext Preprocessor)
 Name: php5-cgi
-Version: 5.2.8
-Release: 1%{?dist}
+Version: 5.3.0
+Release: 2.el4.sme
 %{?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
@@ -310,15 +310,15 @@ support for multi-byte string handling t
 # Prevent %%doc confusion over LICENSE files
 cp Zend/LICENSE Zend/ZEND_LICENSE
 cp TSRM/LICENSE TSRM_LICENSE
-cp regex/COPYRIGHT regex_COPYRIGHT
+cp ext/ereg/regex/COPYRIGHT regex_COPYRIGHT
 cp ext/gd/libgd/README gd_README
 
 # Source is built twice: once for /usr/bin/php5/php, once for the Apache DSO.
 mkdir build-cgi
 
 # Use correct libdir
-perl -pi -e 's|%{_prefix}/lib|%{_libdir}|' php.ini-recommended
-perl -pi -e 's|extension_dir \= \"\.\/\"|extension_dir \= \"%{_libdir}\/php5\/\"|' php.ini-recommended
+perl -pi -e 's|%{_prefix}/lib|%{_libdir}|' php.ini-production
+perl -pi -e 's|extension_dir \= \"\.\/\"|extension_dir \= \"%{_libdir}\/php5\/\"|' php.ini-production
 
 # Remove bogus test; position of read position after fopen(, "a+")
 # is not defined by C standard, so don't presume anything.
@@ -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 \
@@ -473,7 +475,7 @@ rm -fr $RPM_BUILD_ROOT%{_libdir}/php
 
 # Install the default configuration file and icons
 install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/php5
-install -m 644    php.ini-recommended $RPM_BUILD_ROOT%{_sysconfdir}/php5/php.ini
+install -m 644    php.ini-production $RPM_BUILD_ROOT%{_sysconfdir}/php5/php.ini
 #install -m 755 -d $RPM_BUILD_ROOT%{contentdir}/icons
 #install -m 644    *.gif $RPM_BUILD_ROOT%{contentdir}/icons/
 
@@ -529,6 +531,7 @@ rm files.*
 %config %{_sysconfdir}/php5/pear.conf
 %{_bindir}/php5/php
 %{_bindir}/php5/php-cgi
+%{_bindir}/php5/phar.phar
 %dir %{_libdir}/php5
 %dir %{_localstatedir}/lib/php5
 %attr(0700,apache,apache) %dir %{_localstatedir}/lib/php5/session
@@ -554,13 +557,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,23 +582,30 @@ 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
-* Mon Jan 12 2009 David Harper <davidiwharper@hotmail.com> 5.2.8-1.dh
+* 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.el4
 - 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