Author: glen Date: Wed Nov 25 23:01:59 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- restored -stupidapache_version.patch from php4
---- Files affected:
packages/php:
php.spec (1.821 -> 1.822)
---- Diffs:
================================================================
Index: packages/php/php.spec
diff -u packages/php/php.spec:1.821 packages/php/php.spec:1.822
--- packages/php/php.spec:1.821 Wed Nov 25 23:30:45 2009
+++ packages/php/php.spec Thu Nov 26 00:01:54 2009
@@ -126,6 +126,7 @@
Patch31: %{name}-fcgi-graceful.patch
Patch32: %{name}-m4-divert.patch
Patch38: %{name}-tds.patch
+Patch39: %{name}-stupidapache_version.patch
Patch43: %{name}-use-prog_sendmail.patch
Patch47: suhosin.patch
%if %{with type_hints}
@@ -1629,6 +1630,7 @@
%patch31 -p1
%patch32 -p1
%patch38 -p1
+%patch39 -p1
%patch43 -p1
@@ -1713,11 +1715,11 @@
;;
apxs1)
ver=$(rpm -q --qf '%{V}' apache1-devel)
- sapi_args="--with-apxs=%{apxs1}"
+ sapi_args="--with-apxs=%{apxs1} --with-apache-version=$ver"
;;
apxs2)
ver=$(rpm -q --qf '%{V}' apache-devel)
- sapi_args="--with-apxs2=%{apxs2}"
+ sapi_args="--with-apxs2=%{apxs2} --with-apache-version=$ver"
;;
esac
@@ -2736,6 +2738,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.822 2009/11/25 23:01:54 glen
+- restored -stupidapache_version.patch from php4
+
Revision 1.821 2009/11/25 22:30:45 glen
- zend license in prep
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php.spec?r1=1.821&r2=1.822&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
