--- rpms/php5-cgi/contribs7/php5-cgi.spec 2010/03/04 16:11:51 1.4 +++ rpms/php5-cgi/contribs7/php5-cgi.spec 2010/07/15 16:29:12 1.6 @@ -1,4 +1,4 @@ -# $Id: php5-cgi.spec,v 1.3 2009/11/03 06:26:30 marcohess Exp $ +# $Id: php5-cgi.spec,v 1.2 2009/03/04 19:31:30 slords Exp $ # Authority: nocvs # Name: David Harper @@ -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.2 +Release: 1%{?dist} %{?rh90:Epoch: 1 } License: The PHP License Group: Development/Languages @@ -33,8 +33,8 @@ Source50: php5.conf #Patch7: php-4.3.2-libtool15.patch #Patch8: php-4.3.3-miscfix.patch #Patch9: php-4.3.6-umask.patch -Patch10: php-4.3.7-handler.patch -Patch11: php-4.3.8-fdsetsize.patch +#Patch10: php-4.3.7-handler.patch +#Patch11: php-4.3.8-fdsetsize.patch # Fixes for extension modules #Patch21: php-4.3.1-odbc.patch @@ -45,6 +45,9 @@ Patch11: php-4.3.8-fdsetsize.patch #Patch30: php-4.3.1-dlopen.patch #Patch31: php-4.3.4-easter.patch +# Fix for PHAR bug +Patch32: php-5.3.2-phar.patch + BuildRoot: %{_tmppath}/%{name}-root BuildRequires: bzip2-devel, curl-devel >= 7.9, db4-devel, expat-devel, freetype-devel @@ -64,8 +67,6 @@ Requires: php5-cgi-pear Conflicts: php >= 5.0.0 # Require extension which was previously built-in # Requires: php-mbstring = %{version}-%{release} -# ^^ dunno if mbstring is required anymore, couldn't get it to compile -# initially so I nuked the requirement %description @@ -184,6 +185,7 @@ php package. %package odbc Group: Development/Languages Requires: php5-cgi = %{version}-%{release} +Requires: unixODBC Summary: A module for PHP applications that use ODBC databases. Provides: php_database Obsoletes: stronghold-php-odbc @@ -259,6 +261,7 @@ to main PHP package if you plan to use a Summary: A module for PHP applications that query SNMP-managed devices. Group: Development/Languages Requires: php5-cgi = %{version}-%{release} +Requires: net-snmp-utils BuildRequires: net-snmp-devel, elfutils-devel # elfutils-devel requirement workaround for #103982 @@ -287,6 +290,16 @@ Requires: php5-cgi = %{version}-%{releas The php-mbstring package contains a dynamic shared object that will add support for multi-byte string handling to PHP. +%package soap +Summary: A module for PHP applications which use the SOAP protocol +Group: Development/Languages +Requires: php5-cgi = %{version}-%{release} + +%description soap +The php-soap package contains a dynamic shared object that will add +support to PHP for using the SOAP web services protocol. + + %prep %setup -q -n php-%{version} #%patch2 -p1 -b .config @@ -306,19 +319,20 @@ support for multi-byte string handling t #%patch30 -p1 -b .dlopen ##%patch31 -p1 -b .easter +%patch32 -p1 -b .orig # 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. @@ -430,6 +444,7 @@ ln -sf ../configure --with-snmp=shared \ --enable-ucd-snmp-hack \ --with-unixODBC=shared,%{_prefix} \ + --enable-soap=shared \ --enable-memory-limit \ --enable-bcmath \ --enable-shmop \ @@ -466,16 +481,20 @@ build %{?rh90:install -m 644 /etc/httpd/conf/httpd.conf $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf/httpd.conf } # Install from CGI tree -pushd build-cgi -make install INSTALL_ROOT=$RPM_BUILD_ROOT -popd +# pushd build-cgi +# make install INSTALL_ROOT=$RPM_BUILD_ROOT +# popd + +# install everything from the CGI SAPI build +# updated method as of 5.2.13 +make -C build-cgi install INSTALL_ROOT=$RPM_BUILD_ROOT # remove build files 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/ @@ -488,7 +507,7 @@ install -m 755 -d $RPM_BUILD_ROOT%{_loca install -m 700 -d $RPM_BUILD_ROOT%{_localstatedir}/lib/php5/session # Generate files lists and stub .ini files for each subpackage -for mod in pgsql mysql odbc ldap snmp xmlrpc imap %{?_with_mbstring:mbstring} \ +for mod in pgsql mysql odbc ldap snmp soap xmlrpc imap %{?_with_mbstring:mbstring} \ %{?_with_oci8:oci8} %{?_with_mssql:mssql} %{?_with_mhash:mhash} %{?_with_mcrypt:mcrypt}; do cat > $RPM_BUILD_ROOT%{_sysconfdir}/php5/php5.d/${mod}.ini < 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 - +* Wed Jun 6 2010 David Harper 5.3.2-1.el4 +- Update to the latest version of PHP +- Add SOAP extension [SME: 5878] +- Build fixes for CentOS/SME +- Add Fedora patch for phar.phar shebang [PHP: 50578] + * Thu Sep 17 2009 David Harper 5.3.0-2.el4 - Fix for PHP4 compatibility issues [SME: 5463] @@ -615,7 +635,7 @@ rm files.* - Re-add mbstring support - Misc. build fixes for CentOS/SME -* Mon Jan 12 2009 David Harper 5.2.8-1.dh +* Mon Jan 12 2009 David Harper 5.2.8-1.el4 - Upgrade to latest version of PHP - Build fixes for CentOS/SME @@ -623,12 +643,16 @@ rm files.* - Mass upgrade - Added rhel4 flags - Fixed pointers to changed (?) libraries from lib.so to just lib. Odd change. + * Fri Jun 10 2005 Stuart K. Low 5.0.4-2 - Fixed tidy again. + * Sun May 29 2005 Stuart K. Low 5.0.4-1 - Upgrade to 5.0.4 + * Sat Feb 19 2005 Stuart K. Low 5.0.3-3 - addition of --with-tidy + * Wed Jan 26 2005 Stuart K. Low 5.0.3-1 - initial conversion to a CGI version for PHP5 - removed domxml since it's been moved to PECL in PHP5