Author: glen Date: Wed Nov 7 14:42:27 2007 GMT Module: SPECS Tag: DEVEL ---- Log message: - 200711071330 snapshot, cgi thinks it is fcgi ;( - merges from HEAD
---- Files affected: SPECS: php.spec (1.688.2.4 -> 1.688.2.5) ---- Diffs: ================================================================ Index: SPECS/php.spec diff -u SPECS/php.spec:1.688.2.4 SPECS/php.spec:1.688.2.5 --- SPECS/php.spec:1.688.2.4 Tue Oct 23 20:18:21 2007 +++ SPECS/php.spec Wed Nov 7 15:42:22 2007 @@ -73,7 +73,7 @@ %endif %define _rel 0.3 -%define _snap 200710231630 +%define _snap 200711071330 Summary: PHP: Hypertext Preprocessor Summary(fr.UTF-8): Le langage de script embarque-HTML PHP Summary(pl.UTF-8): JÄzyk skryptowy PHP @@ -87,7 +87,7 @@ License: PHP Group: Libraries Source0: http://snaps.php.net/%{name}%{version}-%{_snap}.tar.bz2 -# Source0-md5: 7ed946f72b3b27aadfec579b1addcfaa +# Source0-md5: 249fadb1cfeb0ec9afc2c24cb44d77f5 Source2: zend.gif Source3: %{name}-mod_%{name}.conf Source4: %{name}-cgi-fcgi.ini @@ -1649,30 +1649,32 @@ %endif " for sapi in $sapis; do + : SAPI $sapi [ -f Makefile.$sapi ] && continue # skip if already configured (for faster debugging purposes) - %configure \ - ` + sapi_args='' case $sapi in cgi) - echo --enable-discard-path --enable-force-cgi-redirect + sapi_args='--enable-discard-path --enable-force-cgi-redirect' ;; cli) - echo --disable-cgi + sapi_args='--disable-cgi' ;; fcgi) - echo --enable-fastcgi --with-fastcgi=/usr --enable-force-cgi-redirect + sapi_args='--enable-fastcgi --with-fastcgi=/usr --enable-force-cgi-redirect' ;; apxs1) - ver=%(rpm -q --qf '%%{version}' apache1-apxs) - echo --with-apxs=%{apxs1} --with-apache-version=$ver + ver=$(rpm -q --qf '%{V}' apache1-devel) + sapi_args="--with-apxs=%{apxs1} --with-apache-version=$ver" ;; apxs2) - ver=%(rpm -q --qf '%%{version}' apache-apxs) - echo --with-apxs2=%{apxs2} --with-apache-version=$ver + ver=$(rpm -q --qf '%{V}' apache-devel) + sapi_args="--with-apxs2=%{apxs2} --with-apache-version=$ver" ;; esac - ` \ + + %configure \ + $sapi_args \ %if "%{!?configure_cache:0}%{?configure_cache}" == "0" --cache-file=config.cache \ %endif @@ -1810,18 +1812,22 @@ # 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 -rm -rf sapi/cgi/.libs sapi/cgi/*.lo +[ "$(echo '<?=php_sapi_name();' | ./sapi/fcgi/php-cgi -q)" = cgi-fcgi ] || exit 1 %endif # CGI cp -af php_config.h.cgi main/php_config.h +rm -rf sapi/cgi/.libs sapi/cgi/*.lo %{__make} sapi/cgi/php-cgi -f Makefile.cgi +[ "$(echo '<?=php_sapi_name();' | ./sapi/cgi/php-cgi -q)" = cgi ] || exit 1 # CLI cp -af php_config.h.cli main/php_config.h %{__make} sapi/cli/php -f Makefile.cli +[ "$(echo '<?=php_sapi_name();' | ./sapi/cli/php -q)" = cli ] || exit 1 %if %{with tests} # Run tests, using the CLI SAPI @@ -2260,7 +2266,7 @@ %if %{with fcgi} %files fcgi %defattr(644,root,root,755) -%doc sapi/cgi/README.FastCGI +%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 @@ -2290,6 +2296,7 @@ %doc CREDITS Zend/ZEND_CHANGES %doc LICENSE Zend/LICENSE.Zend EXTENSIONS NEWS TODO* %doc README.PHP4-TO-PHP5-THIN-CHANGES README.UPDATE_5_2 +%doc README.namespaces %dir %{_sysconfdir} %dir %{_sysconfdir}/conf.d @@ -2726,6 +2733,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.688.2.5 2007/11/07 14:42:22 glen +- 200711071330 snapshot, cgi thinks it is fcgi ;( +- merges from HEAD + Revision 1.688.2.4 2007/10/23 18:18:21 glen - 200710231630 snap; sybase_ct enabled - use %{_sysconfdir} to make adapter happy ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/php.spec?r1=1.688.2.4&r2=1.688.2.5&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
