Really added the libqdiagsolver conflict (bnc#870683, bnc#866622).

having it before the %package header has no effect, without a warning :-(
libyui · Aug 26, 2014 · 463581e · 463581e
1 parent 08a6d95
commit 463581e
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/libyui-qt-pkg.spec.in b/libyui-qt-pkg.spec.in
@@ -35,10 +35,6 @@ BuildRequires:  %{libyui_qt_devel_version}
 %define libzypp_devel_version           libzypp-devel >= 12.5.0
 BuildRequires:  %{libzypp_devel_version}
 
-# new packager is in qt5 and crashes if qt3 diagsolver is used (bnc#870683)
-Obsoletes:      libqdialogsolver1 < 1.4.0
-Conflicts:      libqdialogsolver1 < 1.4.0
-
 Url:            @URL@
 Summary:        @SUMMARY@
 License:        LGPL-2.1 or LGPL-3.0
@@ -58,6 +54,10 @@ Obsoletes:      yast2-qt-pkg < 2.42.0
 Provides:       libyui_pkg
 Supplements:    packageand(libyui-qt:yast2-packager)
 
+# new packager is in qt5 and crashes if qt3 diagsolver is used (bnc#870683)
+Obsoletes:      libqdialogsolver1 < 1.4.0
+Conflicts:      libqdialogsolver1 < 1.4.0
+
 Url:            @URL@
 Summary:        @SUMMARY@
 Group:          System/Libraries