packages: php/php.spec - up to 5.3.3, fpm patch included but broken - fpm n...

glen glen at pld-linux.org
Sun Jul 25 12:15:50 CEST 2010


Author: glen                         Date: Sun Jul 25 10:15:50 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 5.3.3, fpm patch included but broken
- fpm needs -fPIC fixing

---- Files affected:
packages/php:
   php.spec (1.877 -> 1.878) 

---- Diffs:

================================================================
Index: packages/php/php.spec
diff -u packages/php/php.spec:1.877 packages/php/php.spec:1.878
--- packages/php/php.spec:1.877	Sat Jul 24 18:16:45 2010
+++ packages/php/php.spec	Sun Jul 25 12:15:44 2010
@@ -60,7 +60,7 @@
 %bcond_without	apache2		# disable building Apache 2.x SAPI
 %bcond_without	zts		# disable Zend Thread Safety
 %bcond_without	cgi			# disable CGI/FCGI SAPI
-%bcond_without	fpm		# fpm patches from http://www.php-fpm.org/
+%bcond_without	fpm		# disable FPM
 %bcond_without	suhosin		# with suhosin patch
 %bcond_with	tests		# default off; test process very often hangs on builders, approx run time 45m; perform "make test"
 %bcond_with	gcov		# Enable Code coverage reporting
@@ -103,7 +103,7 @@
 %undefine	with_filter
 %endif
 
-%define		rel		5
+%define		rel		0.1
 Summary:	PHP: Hypertext Preprocessor
 Summary(fr.UTF-8):	Le langage de script embarque-HTML PHP
 Summary(pl.UTF-8):	Język skryptowy PHP
@@ -111,13 +111,13 @@
 Summary(ru.UTF-8):	PHP Версии 5 - язык препроцессирования HTML-файлов, выполняемый на сервере
 Summary(uk.UTF-8):	PHP Версії 5 - мова препроцесування HTML-файлів, виконувана на сервері
 Name:		php
-Version:	5.3.2
+Version:	5.3.3
 Release:	%{rel}%{?with_type_hints:th}
 Epoch:		4
 License:	PHP
 Group:		Libraries
 Source0:	http://www.php.net/distributions/%{name}-%{version}.tar.bz2
-# Source0-md5:	46f500816125202c48a458d0133254a4
+# Source0-md5:	21ceeeb232813c10283a5ca1b4c87b48
 Source2:	%{name}-mod_%{name}.conf
 Source3:	%{name}-cgi-fcgi.ini
 Source4:	%{name}-apache.ini
@@ -165,7 +165,6 @@
 Patch37:	%{name}-mysqli-charsetphpini.patch
 Patch38:	%{name}-pdo_mysql-charsetphpini.patch
 Patch39:	%{name}-use-prog_sendmail.patch
-Patch40:	%{name}-fpm.patch
 Patch41:	%{name}-fpm-config.patch
 Patch42:	%{name}-fpm-shared.patch
 Patch43:	%{name}-silent-session-cleanup.patch
@@ -1811,7 +1810,6 @@
 %patch38 -p1
 %patch39 -p1
 %if %{with fpm}
-%patch40 -p1
 %patch41 -p1
 %patch42 -p1
 %endif
@@ -3128,6 +3126,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.878  2010/07/25 10:15:44  glen
+- up to 5.3.3, fpm patch included but broken
+- fpm needs -fPIC fixing
+
 Revision 1.877  2010/07/24 16:16:45  glen
 - fix test building
 - add cgi bcond
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php.spec?r1=1.877&r2=1.878&f=u



More information about the pld-cvs-commit mailing list