ensure that we do not allow qt3 diagsolver, otherwise packager crashe…

…s (bnc#870683, bnc#866692)
libyui · Jul 4, 2014 · f13e4fd · f13e4fd
1 parent aa40ac4
commit f13e4fd
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Jul 04 14:51:44 UTC 2014 - jreidinger@suse.com
+
+- Do not allow to run it together with libqdiagsolver in qt3
+  version (bnc#870683, bnc#866692)
+- 2.44.4
+
 -------------------------------------------------------------------
 Tue May 20 14:25:44 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 "4" )
+SET( VERSION_PATCH "5" )
 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,6 +35,10 @@ 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