php rebuild

[packages/openssl.git] / openssl.spec

diff --git a/openssl.spec b/openssl.spec
index 99f119ba42e398a30b241d6474a757476ed4efd9..88aaea6a0a73afb6a624d13ac4a67a9244f9c5c2 100644 (file)
--- a/openssl.spec
+++ b/openssl.spec
@@ -70,6 +70,7 @@ Conflicts:    neon < 0.29.6-8
 Conflicts:     openssh-clients < 2:6.2p2-3
 Conflicts:     openssh-server < 2:6.2p2-3
 Conflicts:     php53-common < 4:5.3.29-26
+Conflicts:     php55-common < 4:5.5.31-2
 Conflicts:     ruby-modules < 1:2.0.0.648-2
 %endif
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)