[dist] avoid zypper dependency conflict on update

openSUSE · Apr 12, 2016 · 3ef109c · 3ef109c
1 parent 7e712c6
commit 3ef109c
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/dist/obs-server.spec b/dist/obs-server.spec
@@ -184,10 +184,7 @@ Requires:       obs-common
 %endif
 
 #For apache
-Requires:       apache2 apache2-mod_xforward rubygem-passenger-apache2
-# enforce passenger update to ruby 2.3 stack without requiring it
-Conflicts:      ruby2.1-rubygem-passenger
-Conflicts:      ruby2.2-rubygem-passenger
+Requires:       apache2 apache2-mod_xforward rubygem-passenger-apache2 ruby2.3-rubygem-passenger
 
 # memcache is required for session data
 Requires:       memcached