]> git.pld-linux.org Git - packages/php.git/commitdiff
conflict old common for php55 auto/th/php-5.5.10-5
authorElan Ruusamäe <glen@delfi.ee>
Sat, 26 Apr 2014 12:43:52 +0000 (15:43 +0300)
committerElan Ruusamäe <glen@delfi.ee>
Sat, 26 Apr 2014 12:43:52 +0000 (15:43 +0300)
php.spec

index 1c546b113a9a51d81f070364100177718ef93a2f..0d130363c8c18eae2e4be605a1ee872352b867cf 100644 (file)
--- 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
This page took 0.044315 seconds and 4 git commands to generate.