[packages/php] conflict old common for php55

glen glen at pld-linux.org
Sat Apr 26 14:43:55 CEST 2014


commit e2d9e36f4781717d4964a5c68e86605eecbde18f
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sat Apr 26 15:43:52 2014 +0300

    conflict old common for php55

 php.spec | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
---
diff --git a/php.spec b/php.spec
index 1c546b1..0d13036 100644
--- a/php.spec
+++ b/php.spec
@@ -128,7 +128,7 @@ ERROR: You need to select at least one Apache SAPI to build shared modules.
 %undefine	with_filter
 %endif
 
-%define		rel	4
+%define		rel	5
 %define		orgname	php
 %define		ver_suffix 55
 %define		php_suffix %{!?with_default_php:%{ver_suffix}}
@@ -551,6 +551,7 @@ Provides:	php(standard)
 %{?with_pcre:%requires_ge_to	pcre pcre-devel}
 Obsoletes:	php-pecl-domxml
 Conflicts:	php4-common < 3:4.4.4-8
+Conflicts:	php55-common < 4:5.5.10-4
 Conflicts:	rpm < 4.4.2-0.2
 
 %description common
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/e2d9e36f4781717d4964a5c68e86605eecbde18f



More information about the pld-cvs-commit mailing list