packages (PHP_5_2): php/php.spec - drag along old deps in -common for "stab...
glen
glen at pld-linux.org
Mon Dec 7 20:12:14 CET 2009
Author: glen Date: Mon Dec 7 19:12:14 2009 GMT
Module: packages Tag: PHP_5_2
---- Log message:
- drag along old deps in -common for "stable" branch; rel 14
---- Files affected:
packages/php:
php.spec (1.805.2.34 -> 1.805.2.35)
---- Diffs:
================================================================
Index: packages/php/php.spec
diff -u packages/php/php.spec:1.805.2.34 packages/php/php.spec:1.805.2.35
--- packages/php/php.spec:1.805.2.34 Fri Dec 4 17:22:08 2009
+++ packages/php/php.spec Mon Dec 7 20:12:08 2009
@@ -112,7 +112,7 @@
Summary(uk.UTF-8): PHP Версії 5 - мова препроцесування HTML-файлів, виконувана на сервері
Name: php
Version: 5.2.11
-Release: 13
+Release: 14
Epoch: 4
License: PHP
Group: Libraries
@@ -465,6 +465,11 @@
Requires: %{name}-session = %{epoch}:%{version}-%{release}
Requires: %{name}-spl = %{epoch}:%{version}-%{release}
%endif
+%if "%{pld_release}" == "ac"
+Requires: %{name}-pcre = %{epoch}:%{version}-%{release}
+Requires: %{name}-session = %{epoch}:%{version}-%{release}
+Requires: %{name}-spl = %{epoch}:%{version}-%{release}
+%endif
Obsoletes: php-pecl-domxml
Conflicts: php4-common < 3:4.4.4-8
Conflicts: rpm < 4.4.2-0.2
@@ -3014,6 +3019,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.805.2.35 2009/12/07 19:12:08 glen
+- drag along old deps in -common for "stable" branch; rel 14
+
Revision 1.805.2.34 2009/12/04 16:22:08 hawk
- make sure we won't break any PHP applications in Titanium due to
pcre/session/spl separation
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php.spec?r1=1.805.2.34&r2=1.805.2.35&f=u
More information about the pld-cvs-commit
mailing list