SPECS (DEVEL): php.spec - up to 2009040101 (post RC1) - unify CGI and Fast...
zergin
zergin at pld-linux.org
Wed Apr 1 17:27:04 CEST 2009
Author: zergin Date: Wed Apr 1 15:27:04 2009 GMT
Module: SPECS Tag: DEVEL
---- Log message:
- up to 2009040101 (post RC1)
- unify CGI and FastCGI packages
This AIN'T tested for smooth updates yet.
- drop php-fcgi
- php-cgi provides php(fcgi)
- php-cgi obsoletes php-fcgi
- php-cgi has symlink php.cgi -> php.fcgi
- use "new ini files"
- php.ini-production as new base config
- full copies for sapi configs
cofiguration isn't merged with base php.ini
- package .phpt unit tests and run-tests.php script into
new php-tests package
---- Files affected:
SPECS:
php.spec (1.688.2.27 -> 1.688.2.28)
---- Diffs:
================================================================
Index: SPECS/php.spec
diff -u SPECS/php.spec:1.688.2.27 SPECS/php.spec:1.688.2.28
--- SPECS/php.spec:1.688.2.27 Tue Mar 17 10:08:14 2009
+++ SPECS/php.spec Wed Apr 1 17:26:57 2009
@@ -11,7 +11,6 @@
# dbase, mhash, mime_magic, ming, ncurses, sybase
# - make additional headers and checking added by mail patch configurable
# - modularize session, standard (output from pure php -m)?
-# - sapi/cgi has fastcgi always built in, ie -fcgi and -cgi packages are the same
# - lib64 patch obsolete by $PHP_LIBDIR ?
# - php-sapi-ini-file.patch broken? (/etc/php/cli.d not read for php-cli!)
# - move mysqlnd out of libphp-common.so?
@@ -57,7 +56,6 @@
%bcond_without xmlrpc # without XML-RPC extension module
%bcond_without apache1 # disable building apache 1.3.x module
%bcond_without apache2 # disable building apache 2.x module
-%bcond_without fcgi # disable building FCGI SAPI
%bcond_without zts # disable experimental-zts
%bcond_with tests # default off; test process very often hangs on buildersl; perform "make test"
@@ -78,8 +76,8 @@
ERROR: You need to select at least one Apache SAPI to build shared modules.
%endif
-%define rel 0.28
-%define snap 200903170730
+%define rel 0.29
+%define snap 200904010630
Summary: PHP: Hypertext Preprocessor
Summary(fr.UTF-8): Le langage de script embarque-HTML PHP
Summary(pl.UTF-8): Język skryptowy PHP
@@ -93,12 +91,8 @@
License: PHP
Group: Libraries
Source0: http://snaps.php.net/%{name}5.3-%{snap}.tar.bz2
-# Source0-md5: 81d73b78769a0731b98ce8218e817313
+# Source0-md5: 1e4406a94afedb816f4faf4de12c4798
Source3: %{name}-mod_%{name}.conf
-Source4: %{name}-cgi-fcgi.ini
-Source5: %{name}-cgi.ini
-Source6: %{name}-apache.ini
-Source7: %{name}-cli.ini
# Taken from: http://browsers.garykeith.com/downloads.asp
Source9: %{name}_browscap.ini
Patch0: %{name}-shared.patch
@@ -110,7 +104,6 @@
Patch6: %{name}-build_modules.patch
Patch7: %{name}-sapi-ini-file.patch
Patch9: %{name}-sh.patch
-Patch10: %{name}-ini.patch
Patch12: %{name}-threads-acfix.patch
Patch14: %{name}-no_pear_install.patch
Patch15: %{name}-zlib.patch
@@ -140,7 +133,7 @@
%if %{with xmlrpc}
BuildRequires: expat-devel
%endif
-%{?with_fcgi:BuildRequires: fcgi-devel}
+Requires: fcgi-devel
%{?with_fdf:BuildRequires: fdftk-devel}
BuildRequires: flex
%if %{with mssql} || %{with sybase_ct}
@@ -300,31 +293,20 @@
%description -n apache-mod_php -l pl.UTF-8
php jako moduł DSO (Dynamic Shared Object) dla apache 2.x.
-%package fcgi
-Summary: php as FastCGI program
-Summary(pl.UTF-8): php jako program FastCGI
-Group: Development/Languages/PHP
-Requires: %{name}-common = %{epoch}:%{version}-%{release}
-Provides: webserver(php) = %{version}
-
-%description fcgi
-php as FastCGI program.
-
-%description fcgi -l pl.UTF-8
-php jako program FastCGI.
-
%package cgi
Summary: php as CGI program
Summary(pl.UTF-8): php jako program CGI
Group: Development/Languages/PHP
Requires: %{name}-common = %{epoch}:%{version}-%{release}
Provides: php(cgi)
+Provides: php(fcgi)
+Obsoletes: php-fcgi
%description cgi
-php as CGI program.
+php as CGI or FastCGI program.
%description cgi -l pl.UTF-8
-php jako program CGI.
+php jako program CGI lub FastCGI.
%package cli
Summary: php as CLI interpreter
@@ -1384,6 +1366,19 @@
%description sysvshm -l pl.UTF-8
Moduł PHP umożliwiający korzystanie z pamięci dzielonej SysV.
+%package tests
+Summary: Contains unit test files for PHP and extensions
+Summary(pl.UTF-8): Zawiera pliki testów jednostkowych dla PHP i rozszerzeń
+Group: Libraries
+URL: http://qa.php.net/
+Requires: %{name}-cli
+
+%description tests
+This package contains unit tests for PHP and it's extensions.
+
+%description tests -l pl.UTF-8
+Ten pakiet zawiera pliki testów jednostkowych dla PHP i rozszerzeń
+
%package tidy
Summary: Tidy extension module for PHP
Summary(pl.UTF-8): Moduł Tidy dla PHP
@@ -1567,7 +1562,7 @@
####%patch7 -p1 UPDATE
%patch9 -p1
-cp php.ini-dist php.ini
+cp php.ini-production php.ini
#%patch10 -p1
#%patch12 -p1
%patch14 -p1
@@ -1628,7 +1623,7 @@
export EXTENSION_DIR="%{php_extensiondir}"
if [ ! -f _built-conf ]; then # configure once (for faster debugging purposes)
- rm -f Makefile.{fcgi,cgi,cli,apxs{1,2}} # now remove Makefile copies
+ rm -f Makefile.{cgi,cli,apxs{1,2}} # now remove Makefile copies
%{__libtoolize}
%{__aclocal}
cp -f /usr/share/automake/config.* .
@@ -1639,9 +1634,6 @@
export CPPFLAGS="-DDEBUG_FASTCGI -DHAVE_STRNDUP"
sapis="
-%if %{with fcgi}
-fcgi
-%endif
cgi cli
%if %{with apache1}
apxs1
@@ -1662,9 +1654,6 @@
cli)
sapi_args='--disable-cgi'
;;
- fcgi)
- sapi_args=''
- ;;
apxs1)
ver=$(rpm -q --qf '%{V}' apache1-devel)
sapi_args="--with-apxs=%{apxs1}"
@@ -1795,15 +1784,6 @@
%{__make} libtool-sapi LIBTOOL_SAPI=sapi/apache2handler/libphp5.la -f Makefile.apxs2
%endif
-# FCGI
-%if %{with fcgi}
-cp -af php_config.h.fcgi main/php_config.h
-rm -rf sapi/cgi/.libs sapi/cgi/*.lo
-%{__make} sapi/cgi/php-cgi -f Makefile.fcgi
-cp -r sapi/cgi sapi/fcgi
-[ "$(echo '<?php echo php_sapi_name();' | ./sapi/fcgi/php-cgi -qn)" = cgi-fcgi ] || exit 1
-%endif
-
# CGI
cp -af php_config.h.cgi main/php_config.h
rm -rf sapi/cgi/.libs sapi/cgi/*.lo
@@ -1852,11 +1832,7 @@
# install CGI
libtool --silent --mode=install install sapi/cgi/php-cgi $RPM_BUILD_ROOT%{_bindir}/php.cgi
-
-# install FCGI
-%if %{with fcgi}
-libtool --silent --mode=install install sapi/fcgi/php-cgi $RPM_BUILD_ROOT%{_bindir}/php.fcgi
-%endif
+ln -sf php.cgi $RPM_BUILD_ROOT%{_bindir}/php.fcgi
# install CLI
libtool --silent --mode=install install sapi/cli/php $RPM_BUILD_ROOT%{_bindir}/php.cli
@@ -1866,23 +1842,22 @@
ln -sf php.cli $RPM_BUILD_ROOT%{_bindir}/php
sed -e 's#%{_prefix}/lib/php#%{_libdir}/php#g' php.ini > $RPM_BUILD_ROOT%{_sysconfdir}/php.ini
-%if %{with fcgi}
-install %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/php-cgi-fcgi.ini
-%endif
-install %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/php-cgi.ini
-install %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/php-cli.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 %{SOURCE9} $RPM_BUILD_ROOT%{_sysconfdir}/browscap.ini
%if %{with apache1}
install %{SOURCE3} $RPM_BUILD_ROOT/etc/apache/conf.d/70_mod_php.conf
-install %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/php-apache.ini
-rm -f $RPM_BUILD_ROOT%{_libdir}/apache1/libphp5.la
+cp php.ini-production $RPM_BUILD_ROOT%{_sysconfdir}/php-apache.ini
+ln -sf $RPM_BUILD_ROOT%{_libdir}/apache1/libphp5.la
%endif
%if %{with apache2}
install %{SOURCE3} $RPM_BUILD_ROOT/etc/httpd/conf.d/70_mod_php.conf
-install %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/php-apache2handler.ini
-rm -f $RPM_BUILD_ROOT%{_libdir}/apache/libphp5.la
+cp php.ini-production $RPM_BUILD_ROOT%{_sysconfdir}/php-apache2handler.ini
+ln -sf $RPM_BUILD_ROOT%{_libdir}/apache/libphp5.la
%endif
cp -f Zend/LICENSE{,.Zend}
@@ -1905,7 +1880,7 @@
generate_inifiles
# per SAPI ini directories
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/{cgi,cli,cgi-fcgi,apache,apache2handler}.d
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/{cgi,cli,apache,apache2handler}.d
# for CLI SAPI only
mv $RPM_BUILD_ROOT%{_sysconfdir}/{conf.d/{pcntl,readline}.ini,cli.d}
@@ -1931,6 +1906,11 @@
install -d $RPM_BUILD_ROOT%{_includedir}/php/ext/mbstring
cp -a ext/mbstring/libmbfl/mbfl/*.h $RPM_BUILD_ROOT%{_includedir}/php/ext/mbstring
+#tests
+install -d $RPM_BUILD_ROOT/usr/share/php/tests
+cp run-tests.php $RPM_BUILD_ROOT/usr/share/php/tests/run-tests.php
+cp -r tests/* $RPM_BUILD_ROOT/usr/share/php/tests
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -2233,20 +2213,12 @@
%attr(755,root,root) %{_libdir}/apache/libphp5.so
%endif
-%if %{with fcgi}
-%files fcgi
-%defattr(644,root,root,755)
-%doc sapi/cgi/README.FastCGI sapi/cgi/CHANGES
-%dir %{_sysconfdir}/cgi-fcgi.d
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php-cgi-fcgi.ini
-%attr(755,root,root) %{_bindir}/php.fcgi
-%endif
-
%files cgi
%defattr(644,root,root,755)
%dir %{_sysconfdir}/cgi.d
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php-cgi.ini
%attr(755,root,root) %{_bindir}/php.cgi
+%{_bindir}/php.fcgi
%files cli
%defattr(644,root,root,755)
@@ -2621,6 +2593,36 @@
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/sysvshm.ini
%attr(755,root,root) %{php_extensiondir}/sysvshm.so
+%files tests
+%defattr(644,root,root,755)
+%dir /usr/share/php/tests
+/usr/share/php/tests/quicktester.inc
+/usr/share/php/tests/run-tests.php
+
+%dir /usr/share/php/tests/basic
+/usr/share/php/tests/basic/*
+
+%dir /usr/share/php/tests/classes
+/usr/share/php/tests/classes/*
+
+%dir /usr/share/php/tests/func
+/usr/share/php/tests/func/*
+
+%dir /usr/share/php/tests/lang
+/usr/share/php/tests/lang/*
+
+%dir /usr/share/php/tests/output
+/usr/share/php/tests/output/*
+
+%dir /usr/share/php/tests/run-test
+/usr/share/php/tests/run-test/*
+
+%dir /usr/share/php/tests/security
+/usr/share/php/tests/security/*
+
+%dir /usr/share/php/tests/strings
+/usr/share/php/tests/strings/*
+
%if %{with tidy}
%files tidy
%defattr(644,root,root,755)
@@ -2683,6 +2685,24 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.688.2.28 2009/04/01 15:26:57 zergin
+- up to 2009040101 (post RC1)
+
+- unify CGI and FastCGI packages
+ This AIN'T tested for smooth updates yet.
+ - drop php-fcgi
+ - php-cgi provides php(fcgi)
+ - php-cgi obsoletes php-fcgi
+ - php-cgi has symlink php.cgi -> php.fcgi
+
+- use "new ini files"
+ - php.ini-production as new base config
+ - full copies for sapi configs
+ cofiguration isn't merged with base php.ini
+
+- package .phpt unit tests and run-tests.php script into
+ new php-tests package
+
Revision 1.688.2.27 2009/03/17 09:08:14 glen
- 200903170730 snap
- simplexml as shared
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/php.spec?r1=1.688.2.27&r2=1.688.2.28&f=u
More information about the pld-cvs-commit
mailing list