--- rpms/php5-cgi/contribs7/php5-cgi.spec	2009/11/03 06:26:30	1.3
+++ 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.2 2009/03/04 19:31:30 slords Exp $
-# Authority: ????
+# 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: 2%{?dist}
+Version: 5.3.0
+Release: 2.el4.sme
 %{?rh90:Epoch: 1 }
 License: The PHP License
 Group: Development/Languages
@@ -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.
@@ -475,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/
 
@@ -531,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
@@ -597,28 +598,16 @@ rm files.*
 %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
+* 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
 - Mass upgrade
 - Added rhel4 flags