rpms/php
5
0
Fork 0
Code Issues Pull Requests Releases Activity

* Wed Apr 13 2005 Joe Orton <jorton@redhat.com> 5.0.4-6

Browse Source 
- build /usr/bin/php with the CLI SAPI, and add /usr/bin/php-cgi,
  built with the CGI SAPI (thanks to Edward Rudd, #137704)
- add php(1) man page for CLI
- fix more test cases to use -n when invoking php
This commit is contained in:
jorton 2005-04-13 09:52:41 +00:00
parent 79b22fda9c
commit 1005a1c62d
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
php.spec
View File

@ -7,7 +7,7 @@
Summary: The PHP HTML-embedded scripting language. (PHP: Hypertext Preprocessor) Summary: The PHP HTML-embedded scripting language. (PHP: Hypertext Preprocessor)
Name: php Name: php
Version: 5.0.4 Version: 5.0.4
Release: 5 Release: 6
License: The PHP License License: The PHP License
Group: Development/Languages Group: Development/Languages
URL: http://www.php.net/ URL: http://www.php.net/
@ -432,8 +432,7 @@ fi
make %{?_smp_mflags} make %{?_smp_mflags}
} }
# Build standalone /usr/bin/php and shared extension modules that # Build /usr/bin/php-cgi with the CGI SAPI, and all the shared extensions
# do not need to be built twice.
pushd build-cgi pushd build-cgi
build --enable-force-cgi-redirect \ build --enable-force-cgi-redirect \
--enable-pcntl \ --enable-pcntl \
@ -458,7 +457,7 @@ build --enable-force-cgi-redirect \
--with-xsl=shared,%{_prefix} --with-xsl=shared,%{_prefix}
popd popd
# Build Apache module # Build Apache module, and the CLI SAPI, /usr/bin/php
pushd build-apache pushd build-apache
build --with-apxs2=%{_sbindir}/apxs \ build --with-apxs2=%{_sbindir}/apxs \
--without-mysql --without-gd \ --without-mysql --without-gd \
@ -466,8 +465,8 @@ build --with-apxs2=%{_sbindir}/apxs \
popd popd
%check %check
cd build-cgi cd build-apache
# Run tests # Run tests, using the CLI SAPI
export NO_INTERACTION=1 REPORT_EXIT_STATUS=1 MALLOC_CHECK_=2 export NO_INTERACTION=1 REPORT_EXIT_STATUS=1 MALLOC_CHECK_=2
unset TZ LANG LC_ALL unset TZ LANG LC_ALL
if ! make test; then if ! make test; then
@ -485,14 +484,16 @@ unset NO_INTERACTION REPORT_EXIT_STATUS MALLOC_CHECK_
%install %install
[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
# Install from CGI tree # Install everything from the CGI SAPI build
pushd build-cgi pushd build-cgi
make install INSTALL_ROOT=$RPM_BUILD_ROOT make install INSTALL_ROOT=$RPM_BUILD_ROOT
mv $RPM_BUILD_ROOT%{_bindir}/php $RPM_BUILD_ROOT%{_bindir}/php-cgi
popd popd
# Install the Apache module # Install the Apache module and CLI
pushd build-apache pushd build-apache
make install-sapi INSTALL_ROOT=$RPM_BUILD_ROOT make install-sapi INSTALL_ROOT=$RPM_BUILD_ROOT
make install-cli INSTALL_ROOT=$RPM_BUILD_ROOT
popd popd
# Install the default configuration file and icons # Install the default configuration file and icons
@ -552,9 +553,11 @@ rm files.*
%defattr(-,root,root) %defattr(-,root,root)
%doc CODING_STANDARDS CREDITS EXTENSIONS INSTALL LICENSE NEWS README* %doc CODING_STANDARDS CREDITS EXTENSIONS INSTALL LICENSE NEWS README*
%doc Zend/ZEND_* gd_README TSRM_LICENSE regex_COPYRIGHT %doc Zend/ZEND_* gd_README TSRM_LICENSE regex_COPYRIGHT
%config(noreplace) %{_sysconfdir}/php.ini %config %{_sysconfdir}/php.ini
%config %{_sysconfdir}/pear.conf %config %{_sysconfdir}/pear.conf
%{_bindir}/php %{_bindir}/php
%{_bindir}/php-cgi
%{_mandir}/man?/*
%dir %{_libdir}/php %dir %{_libdir}/php
%dir %{_libdir}/php/modules %dir %{_libdir}/php/modules
%dir %{_localstatedir}/lib/php %dir %{_localstatedir}/lib/php
@ -604,6 +607,12 @@ rm files.*
%endif %endif
%changelog %changelog
* Wed Apr 13 2005 Joe Orton <jorton@redhat.com> 5.0.4-6
- build /usr/bin/php with the CLI SAPI, and add /usr/bin/php-cgi,
built with the CGI SAPI (thanks to Edward Rudd, #137704)
- add php(1) man page for CLI
- fix more test cases to use -n when invoking php
* Wed Apr 13 2005 Joe Orton <jorton@redhat.com> 5.0.4-5 * Wed Apr 13 2005 Joe Orton <jorton@redhat.com> 5.0.4-5
- rebuild for new libpq soname - rebuild for new libpq soname