packages (DEVEL): php/php.spec - split ini config style is back; php-cgi is...
arekm
arekm at pld-linux.org
Mon Jul 6 14:45:56 CEST 2009
Author: arekm Date: Mon Jul 6 12:45:56 2009 GMT
Module: packages Tag: DEVEL
---- Log message:
- split ini config style is back; php-cgi is php-fcgi, too
---- Files affected:
packages/php:
php.spec (1.688.2.35 -> 1.688.2.36)
---- Diffs:
================================================================
Index: packages/php/php.spec
diff -u packages/php/php.spec:1.688.2.35 packages/php/php.spec:1.688.2.36
--- packages/php/php.spec:1.688.2.35 Sun Jul 5 02:30:41 2009
+++ packages/php/php.spec Mon Jul 6 14:45:50 2009
@@ -94,7 +94,10 @@
Group: Libraries
Source0: http://www.php.net/distributions/%{name}-%{version}.tar.bz2
# Source0-md5: 846760cd655c98dfd86d6d97c3d964b0
-Source3: %{name}-mod_%{name}.conf
+Source2: %{name}-mod_%{name}.conf
+Source3: %{name}-cgi-fcgi.ini
+Source4: %{name}-apache.ini
+Source5: %{name}-cli.ini
# Taken from: http://browsers.garykeith.com/downloads.asp
Source9: %{name}_browscap.ini
Patch0: %{name}-shared.patch
@@ -127,7 +130,6 @@
URL: http://www.php.net/
%{?with_interbase:%{!?with_interbase_inst:BuildRequires: Firebird-devel >= 1.0.2.908-2}}
%{?with_pspell:BuildRequires: aspell-devel >= 2:0.50.0}
-BuildRequires: before merge to HEAD: php-sapi-ini-file.patch broken? (/etc/php/cli.d not read for php-cli!), HEAD like SAPI.ini + common.ini syle lost (see r1.688.2.28), -cgi -> -fcgi needs to be retought
BuildRequires: autoconf >= 2.53
BuildRequires: automake >= 1.4d
BuildRequires: bison
@@ -303,14 +305,15 @@
php jako moduł DSO (Dynamic Shared Object) dla apache 2.x.
%package cgi
-Summary: php as CGI program
-Summary(pl.UTF-8): php jako program CGI
+Summary: php as CGI/FastCGI program
+Summary(pl.UTF-8): php jako program CGI/FastCGI
Group: Development/Languages/PHP
Requires: %{name}-common = %{epoch}:%{version}-%{release}
Provides: php(cgi)
Provides: php(fcgi)
Provides: webserver(php)
-Obsoletes: php-fcgi
+Provides: %{name}-fcgi = %{epoch}:%{version}-%{release}
+Obsoletes: php-fcgi < 4:5.3.0
%description cgi
php as CGI or FastCGI program.
@@ -1658,7 +1661,7 @@
export EXTENSION_DIR="%{php_extensiondir}"
if [ ! -f _built-conf ]; then # configure once (for faster debugging purposes)
- rm -f Makefile.{cgi,cli,apxs{1,2}} # now remove Makefile copies
+ rm -f Makefile.{cgi-fcgi,cli,apxs{1,2}} # now remove Makefile copies
%{__libtoolize}
%{__aclocal}
cp -f /usr/share/automake/config.* .
@@ -1669,7 +1672,7 @@
export CPPFLAGS="-DDEBUG_FASTCGI -DHAVE_STRNDUP"
sapis="
-cgi cli
+cgi-fcgi cli
%if %{with apache1}
apxs1
%endif
@@ -1683,7 +1686,7 @@
sapi_args=''
case $sapi in
- cgi)
+ cgi-fcgi)
sapi_args=''
;;
cli)
@@ -1822,15 +1825,15 @@
%endif
# CGI
-cp -af php_config.h.cgi main/php_config.h
+cp -af php_config.h.cgi-fcgi main/php_config.h
rm -rf sapi/cgi/.libs sapi/cgi/*.lo
-%{__make} sapi/cgi/php-cgi -f Makefile.cgi
+%{__make} sapi/cgi/php-cgi -f Makefile.cgi-fcgi
[ "$(echo '<?=php_sapi_name();' | ./sapi/cgi/php-cgi -qn)" = cgi-fcgi ] || exit 1
# CLI
cp -af php_config.h.cli main/php_config.h
%{__make} sapi/cli/php -f Makefile.cli
-[ "$(echo '<?php echo php_sapi_name();' | ./sapi/cli/php -qn)" = cli ] || exit 1
+[ "$(echo '<?=php_sapi_name();' | ./sapi/cli/php -qn)" = cli ] || exit 1
%if %{with tests}
# Run tests, using the CLI SAPI
@@ -1881,20 +1884,20 @@
sed -e 's#%{_prefix}/lib/php#%{_libdir}/php#g' php.ini > $RPM_BUILD_ROOT%{_sysconfdir}/php.ini
install -d $RPM_BUILD_ROOT%{_sysconfdir}
-cp php.ini-production $RPM_BUILD_ROOT%{_sysconfdir}/php-cli.ini
-cp php.ini-production $RPM_BUILD_ROOT%{_sysconfdir}/php-cgi.ini
+install %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/php-cli.ini
+install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/php-cgi-fcgi.ini
install %{SOURCE9} $RPM_BUILD_ROOT%{_sysconfdir}/browscap.ini
%if %{with apache1}
install %{SOURCE3} $RPM_BUILD_ROOT/etc/apache/conf.d/70_mod_php.conf
-cp php.ini-production $RPM_BUILD_ROOT%{_sysconfdir}/php-apache.ini
-ln -sf $RPM_BUILD_ROOT%{_libdir}/apache1/libphp5.la
+install %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/php-apache.ini
+rm -f $RPM_BUILD_ROOT%{_libdir}/apache1/libphp5.la
%endif
%if %{with apache2}
install %{SOURCE3} $RPM_BUILD_ROOT/etc/httpd/conf.d/70_mod_php.conf
-cp php.ini-production $RPM_BUILD_ROOT%{_sysconfdir}/php-apache2handler.ini
-ln -sf $RPM_BUILD_ROOT%{_libdir}/apache/libphp5.la
+install %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/php-apache2handler.ini
+rm -f $RPM_BUILD_ROOT%{_libdir}/apache/libphp5.la
%endif
cp -f Zend/LICENSE{,.Zend}
@@ -1917,7 +1920,7 @@
generate_inifiles
# per SAPI ini directories
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/{cgi,cli,apache,apache2handler}.d
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/{cgi-fcgi,cli,apache,apache2handler}.d
# for CLI SAPI only
mv $RPM_BUILD_ROOT%{_sysconfdir}/{conf.d/{pcntl,readline}.ini,cli.d}
@@ -2256,8 +2259,8 @@
%files cgi
%defattr(644,root,root,755)
-%dir %{_sysconfdir}/cgi.d
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php-cgi.ini
+%dir %{_sysconfdir}/cgi-fcgi.d
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php-cgi-fcgi.ini
%attr(755,root,root) %{_bindir}/php.cgi
%attr(755,root,root) %{_bindir}/php.fcgi
@@ -2715,6 +2718,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.688.2.36 2009/07/06 12:45:50 arekm
+- split ini config style is back; php-cgi is php-fcgi, too
+
Revision 1.688.2.35 2009/07/05 00:30:41 zergin
- fix docuentation URL for intl extension
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php.spec?r1=1.688.2.35&r2=1.688.2.36&f=u
More information about the pld-cvs-commit
mailing list