Author: glen Date: Tue Sep 22 08:53:58 2009 GMT Module: packages Tag: PHP_5_2 ---- Log message: - restore shared -hash
---- Files affected: packages/php: php.spec (1.805.2.11 -> 1.805.2.12) ---- Diffs: ================================================================ Index: packages/php/php.spec diff -u packages/php/php.spec:1.805.2.11 packages/php/php.spec:1.805.2.12 --- packages/php/php.spec:1.805.2.11 Fri Sep 18 20:27:27 2009 +++ packages/php/php.spec Tue Sep 22 10:53:52 2009 @@ -15,6 +15,16 @@ # - http://forum.lighttpd.net/topic/34454 # - ttyname_r() missdetected http://bugs.php.net/bug.php?id=48820 # +# To see optional extension deps: +# $ grep -r PHP_ADD_EXTENSION_DEP.*,.*,.* . +#./ext/pdo/config.m4: PHP_ADD_EXTENSION_DEP(pdo, spl, true) +#./ext/spl/config.m4: PHP_ADD_EXTENSION_DEP(spl, pcre, true) +#./ext/session/config.m4: PHP_ADD_EXTENSION_DEP(session, hash, true) +#./ext/sqlite/config.m4: PHP_ADD_EXTENSION_DEP(sqlite, spl, true) +#./ext/sqlite/config.m4: PHP_ADD_EXTENSION_DEP(sqlite, pdo, true) +#./ext/simplexml/config.m4: PHP_ADD_EXTENSION_DEP(simplexml, spl, true) +#./ext/xmlreader/config.m4: PHP_ADD_EXTENSION_DEP(xmlreader, dom, true) +# # Conditional build: %bcond_with fdf # with FDF (PDF forms) module (BR: proprietary lib) %bcond_with interbase_inst # use InterBase install., not Firebird (BR: proprietary libs) @@ -168,6 +178,7 @@ Patch46: %{name}-imap-myrights.patch Patch47: suhosin.patch Patch49: %{name}-m4-divert.patch +Patch50: extension-shared-optional-dep.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} @@ -426,7 +437,6 @@ 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} @@ -443,10 +453,8 @@ %{?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 @@ -749,6 +757,22 @@ 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 @@ -1668,6 +1692,7 @@ %patch47 -p1 %endif %patch49 -p1 +%patch50 -p1 # conflict seems to be resolved by recode patches rm -f ext/recode/config9.m4 @@ -1801,7 +1826,7 @@ --enable-pcntl=shared \ --enable-pdo=shared \ --enable-json=shared \ - --enable-hash \ + --enable-hash=shared \ --enable-xmlwriter=shared \ %if %{with fpm} --with-fpm-conf=%{_sysconfdir}/fpm.conf \ @@ -2153,6 +2178,7 @@ %extension_scripts gd %extension_scripts gettext %extension_scripts gmp +%extension_scripts hash %extension_scripts iconv %extension_scripts imap %extension_scripts interbase @@ -2538,6 +2564,11 @@ %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 @@ -2865,6 +2896,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.805.2.12 2009/09/22 08:53:52 glen +- restore shared -hash + 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) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php.spec?r1=1.805.2.11&r2=1.805.2.12&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
