From 26568ffffa56d5901fe103906286d555e5818fe4fceb4a778dc43a67c35d191b Mon Sep 17 00:00:00 2001
From: Michal Seben <mseben@gmail.com>
Date: Sat, 25 Dec 2010 21:26:12 +0000
Subject: [PATCH] Accepting request 56734 from home:mseben

provides/obsoletes polishing

OBS-URL: https://build.opensuse.org/request/show/56734
OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=9
---
 virtualbox-guest-preamble |  4 ++--
 virtualbox-host-preamble  |  4 ++--
 virtualbox.spec           | 28 +++++++++++++++-------------
 3 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/virtualbox-guest-preamble b/virtualbox-guest-preamble
index 2aeae03..9084280 100644
--- a/virtualbox-guest-preamble
+++ b/virtualbox-guest-preamble
@@ -1,5 +1,5 @@
 Requires: kernel-%1
 Provides: virtualbox-guest-kmp = %version
 #rename from ose version:
-Provides:  virtualbox-ose-guest-kmp = %version
-Obsoletes: virtualbox-ose-guest-kmp < %version
+Provides:  virtualbox-ose-guest-kmp-%1 <= %version
+Obsoletes: virtualbox-ose-guest-kmp-%1 <= %version
diff --git a/virtualbox-host-preamble b/virtualbox-host-preamble
index d2406a8..c59095a 100644
--- a/virtualbox-host-preamble
+++ b/virtualbox-host-preamble
@@ -1,5 +1,5 @@
 Requires: kernel-%1
 Provides: virtualbox-host-kmp = %version
 #rename from ose version:
-Provides: virtualbox-ose-host-kmp = %version
-Obsoletes: virtualbox-ose-host-kmp < %version
+Provides: virtualbox-ose-host-kmp-%1 <= %version
+Obsoletes: virtualbox-ose-host-kmp-%1 <= %version
diff --git a/virtualbox.spec b/virtualbox.spec
index ec37e23..4d62528 100644
--- a/virtualbox.spec
+++ b/virtualbox.spec
@@ -88,11 +88,10 @@ Patch101:       vbox-default-os-type.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 PreReq:         pwdutils permissions
 Requires:       %{name}-host-kmp = %version
-#Suggests:       %{name}-qt = %version
 Recommends:     %{name}-gui = %version
 #rename from ose version:
-Provides:       %{name}-ose = %version
-Obsoletes:      %{name}-ose < %version
+Provides:       %{name}-ose <= %version
+Obsoletes:      %{name}-ose <= %version
 
 %description
 VirtualBox is an extremely feature rich, high performance product
@@ -106,9 +105,12 @@ Summary:        Qt GUI part for %{name}
 Group:          System/Emulators/PC
 Requires:       %{name} = %{version}
 Provides:       %{name}-gui = %{version}
+#this is needed during update to trigger installing qt subpackage
+#http://en.opensuse.org/openSUSE:Upgrade_dependencies_explanation#Splitting_and_Merging
+Provides:       %{name}-ose:/usr/lib/virtualbox/VirtualBox.so
 #rename from "ose" version:
-Provides:       %{name}-ose-qt = %version
-Obsoletes:      %{name}-ose-qt < %version
+Provides:       %{name}-ose-qt <= %version
+Obsoletes:      %{name}-ose-qt <= %version
 
 
 %description qt
@@ -141,8 +143,8 @@ Group:          System/X11/Servers/XF86_4
 Requires:       %{name}-guest-kmp = %version
 Supplements:    modalias(pci:v000080EEd0000BEEFsv*sd*bc*sc*i*)
 #rename from xorg-x11-driver-virtualbox-ose:
-Provides:       xorg-x11-driver-virtualbox-ose = %version
-Obsoletes:      xorg-x11-driver-virtualbox-ose < %version
+Provides:       xorg-x11-driver-virtualbox-ose <= %version
+Obsoletes:      xorg-x11-driver-virtualbox-ose <= %version
 
 %description guest-x11
 VirtualBox 
@@ -155,8 +157,8 @@ Group:          System/Emulators/PC
 Requires:       %{name}-guest-kmp = %version
 Supplements:    modalias(pci:v000080EEd0000BEEFsv*sd*bc*sc*i*)
 #rename from "ose" version:
-Provides:       virtualbox-ose-guest-tools = %version
-Obsoletes:      virtualbox-ose-guest-tools < %version
+Provides:       %{name}-ose-guest-tools <= %version
+Obsoletes:      %{name}-ose-guest-tools <= %version
 
 %description guest-tools
 VirtualBox guest addition tools.
@@ -167,8 +169,8 @@ Summary:        Python bindings for %{name}
 Group:          Development/Libraries/Python
 Requires:       %{name} = %{version}
 #rename from "ose" version:
-Provides:       python-%{name}-ose = %version
-Obsoletes:      python-%{name}-ose < %version
+Provides:       python-%{name}-ose <= %version
+Obsoletes:      python-%{name}-ose <= %version
 
 %description -n python-%{name}
 Python XPCOM bindings to %{name}. Used e.g. by vboxgtk package.
@@ -180,8 +182,8 @@ Group:          Development/Libraries/Other
 Requires:       %{name} = %{version}
 Requires:       python-%{name} = %{version}
 #rename from "ose" version:
-Provides:       %{name}-ose-devel = %version
-Obsoletes:      %{name}-ose-devel < %version
+Provides:       %{name}-ose-devel <= %version
+Obsoletes:      %{name}-ose-devel <= %version
 
 %description devel
 Development file for %{name}