packages (PHP_5_2): php/php.spec, php/php-bug-48619.patch (REMOVED) - up to...

[arekm]

Author: arekm                        Date: Fri Sep 18 18:27:33 2009 GMT
Module: packages                      Tag: PHP_5_2
---- Log message:
- up to 5.2.11 (hash is now merged into common since session requires it)

---- Files affected:
packages/php:
   php.spec (1.805.2.10 -> 1.805.2.11) , php-bug-48619.patch (1.1.2.2 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/php/php.spec
diff -u packages/php/php.spec:1.805.2.10 packages/php/php.spec:1.805.2.11
--- packages/php/php.spec:1.805.2.10	Mon Sep 14 12:49:42 2009
+++ packages/php/php.spec	Fri Sep 18 20:27:27 2009
@@ -100,13 +100,13 @@
 Summary(ru.UTF-8):	PHP Версии 5 - язык препроцессирования HTML-файлов, выполняемый на сервере
 Summary(uk.UTF-8):	PHP Версії 5 - мова препроцесування HTML-файлів, виконувана на сервері
 Name:		php
-Version:	5.2.10
-Release:	13
+Version:	5.2.11
+Release:	1
 Epoch:		4
 License:	PHP
 Group:		Libraries
 Source0:	http://www.php.net/distributions/%{name}-%{version}.tar.bz2
-# Source0-md5:	15c7b5a87f57332d6fc683528e28247b
+# Source0-md5:	286bf34630f5643c25ebcedfec5e0a09
 Source2:	%{name}-mod_%{name}.conf
 Source3:	%{name}-cgi-fcgi.ini
 Source4:	%{name}-cgi.ini
@@ -167,9 +167,7 @@
 Patch45:	%{name}-imap-annotations.patch
 Patch46:	%{name}-imap-myrights.patch
 Patch47:	suhosin.patch
-Patch48:	%{name}-bug-48697.patch
 Patch49:	%{name}-m4-divert.patch
-Patch50:	%{name}-bug-48619.patch
 URL:		http://www.php.net/
 %{?with_interbase:%{!?with_interbase_inst:BuildRequires:	Firebird-devel >= 1.0.2.908-2}}
 %{?with_pspell:BuildRequires:	aspell-devel >= 2:0.50.0}
@@ -428,6 +426,7 @@
 Requires:	glibc >= 6:2.3.5
 Requires:	php-dirs
 Provides:	php(date)
+Provides:	php(hash)
 Provides:	php(libxml)
 %{?with_zend_multibyte:Provides:	php(mbstring)}
 Provides:	php(modules_api) = %{php_api_version}
@@ -444,8 +443,10 @@
 %{?with_pcre:Provides:	php-pcre = %{epoch}:%{version}-%{release}}
 Provides:	php5(debug) = %{php_debug}
 Provides:	php5(thread-safety) = %{zend_zts}
+Obsoletes:	php-hash
 Obsoletes:	php-pcre < 4:5.2.0
 Obsoletes:	php-pecl-domxml
+Obsoletes:	php-pecl-hash
 Obsoletes:	php-session < 3:4.2.1-2
 Conflicts:	php4-common < 3:4.4.4-8
 Conflicts:	rpm < 4.4.2-0.2
@@ -748,22 +749,6 @@
 Moduł PHP umożliwiający korzystanie z biblioteki gmp do obliczeń na
 liczbach o dowolnej długości.
 
-%package hash
-Summary:	HASH Message Digest Framework
-Summary(pl.UTF-8):	Szkielet do obliczania skrótów wiadomości
-Group:		Libraries
-Requires:	%{name}-common = %{epoch}:%{version}-%{release}
-Provides:	php(hash)
-Obsoletes:	php-pecl-hash
-
-%description hash
-Native implementations of common message digest algorithms using a
-generic factory method.
-
-%description hash -l pl.UTF-8
-Natywne implementacje popularnych algorytmów obliczania skrótów
-wiadomości przy użyciu wspólnego interfejsu.
-
 %package iconv
 Summary:	iconv extension module for PHP
 Summary(pl.UTF-8):	Moduł iconv dla PHP
@@ -1682,9 +1667,7 @@
 %if %{with suhosin}
 %patch47 -p1
 %endif
-%patch48 -R -p3
 %patch49 -p1
-%patch50 -p1
 
 # conflict seems to be resolved by recode patches
 rm -f ext/recode/config9.m4
@@ -1818,7 +1801,7 @@
 	--enable-pcntl=shared \
 	--enable-pdo=shared \
 	--enable-json=shared \
-	--enable-hash=shared \
+	--enable-hash \
 	--enable-xmlwriter=shared \
 %if %{with fpm}
 	--with-fpm-conf=%{_sysconfdir}/fpm.conf \
@@ -2170,7 +2153,6 @@
 %extension_scripts gd
 %extension_scripts gettext
 %extension_scripts gmp
-%extension_scripts hash
 %extension_scripts iconv
 %extension_scripts imap
 %extension_scripts interbase
@@ -2556,11 +2538,6 @@
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/gmp.ini
 %attr(755,root,root) %{php_extensiondir}/gmp.so
 
-%files hash
-%defattr(644,root,root,755)
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/hash.ini
-%attr(755,root,root) %{php_extensiondir}/hash.so
-
 %files iconv
 %defattr(644,root,root,755)
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/iconv.ini
@@ -2888,6 +2865,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.805.2.11  2009/09/18 18:27:27  arekm
+- up to 5.2.11 (hash is now merged into common since session requires it)
+
 Revision 1.805.2.10  2009/09/14 10:49:42  arekm
 - rel 13; really get rid of expat
 
================================================================

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