Author: glen Date: Fri Jun 1 08:43:59 2007 GMT
Module: SPECS Tag: AC-branch
---- Log message:
- fix cgi/fcgi build/install
---- Files affected:
SPECS:
php.spec (1.631.2.38 -> 1.631.2.39)
---- Diffs:
================================================================
Index: SPECS/php.spec
diff -u SPECS/php.spec:1.631.2.38 SPECS/php.spec:1.631.2.39
--- SPECS/php.spec:1.631.2.38 Fri Jun 1 10:13:39 2007
+++ SPECS/php.spec Fri Jun 1 10:43:53 2007
@@ -75,7 +75,7 @@
%define check %{nil}
%endif
-%define _rel 0.1
+%define _rel 1
Summary: PHP: Hypertext Preprocessor
Summary(fr): Le langage de script embarque-HTML PHP
Summary(pl): Język skryptowy PHP
@@ -1819,14 +1819,14 @@
# FCGI
%if %{with fcgi}
cp -af php_config.h.fcgi main/php_config.h
-%{__make} sapi/cgi/php -f Makefile.fcgi LDFLAGS=-lpthread
+%{__make} sapi/cgi/php-cgi -f Makefile.fcgi LDFLAGS=-lpthread
cp -r sapi/cgi sapi/fcgi
rm -rf sapi/cgi/.libs sapi/cgi/*.lo
%endif
# CGI
cp -af php_config.h.cgi main/php_config.h
-%{__make} sapi/cgi/php -f Makefile.cgi LDFLAGS=-lpthread
+%{__make} sapi/cgi/php-cgi -f Makefile.cgi LDFLAGS=-lpthread
# CLI
cp -af php_config.h.cli main/php_config.h
@@ -1868,11 +1868,11 @@
sed -i -e 's|libphp_common.la|$(libdir)/libphp_common.la|'
$RPM_BUILD_ROOT%{_libdir}/php/build/acinclude.m4
# install CGI
-libtool --silent --mode=install install sapi/cgi/php
$RPM_BUILD_ROOT%{_bindir}/php.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
$RPM_BUILD_ROOT%{_bindir}/php.fcgi
+libtool --silent --mode=install install sapi/fcgi/php-cgi
$RPM_BUILD_ROOT%{_bindir}/php.fcgi
%endif
# install CLI
@@ -2734,6 +2734,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.631.2.39 2007/06/01 08:43:53 glen
+- fix cgi/fcgi build/install
+
Revision 1.631.2.38 2007/06/01 08:13:39 glen
- 5.2.3: resolves CVE-2007-2872, CVE-2007-2756, CVE-2007-1900;
improves fix for CVE-2007-1887
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/php.spec?r1=1.631.2.38&r2=1.631.2.39&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
