Merge pull request #19 from mvidner/master

Really added the libqdiagsolver conflict (bnc#870683, bnc#866622).
libyui · Aug 26, 2014 · 4440260 · 4440260
2 parents 08a6d95 + 68e0b7d
commit 4440260
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Aug 26 13:12:05 UTC 2014 - mvidner@suse.com
+
+- Really added the libqdiagsolver conflict (bnc#870683, bnc#866622).
+- 2.44.7
+
 -------------------------------------------------------------------
 Mon Jul 28 12:23:18 UTC 2014 - mvidner@suse.com
 

diff --git a/VERSION.cmake b/VERSION.cmake
@@ -1,6 +1,6 @@
 SET( VERSION_MAJOR "2" )
 SET( VERSION_MINOR "44" )
-SET( VERSION_PATCH "6" )
+SET( VERSION_PATCH "7" )
 SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" )
 
 ##### This is need for the libyui core, ONLY.

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