From 3a6ca4251f45be7dff95502728b9c46e528240f18471301abf99842a10d457e1 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Mon, 7 Jun 2010 07:45:04 +0000
Subject: [PATCH] Better module logic

OBS-URL: https://build.opensuse.org/package/show/Virtualization:VMware/open-vm-tools?expand=0&rev=160
---
 open-vm-tools.changes |  6 ++++++
 open-vm-tools.spec    | 17 +++++++++++------
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/open-vm-tools.changes b/open-vm-tools.changes
index 8f3993b..645890f 100644
--- a/open-vm-tools.changes
+++ b/open-vm-tools.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon May 31 08:37:32 UTC 2010 - dimstar@opensuse.org
+
+- Better logic to easily disable modules that got inlcluded in the
+  Linux Kernel, for bnc#605085.
+
 -------------------------------------------------------------------
 Thu Apr 22 11:25:39 CEST 2010 - dimstar@opensuse.org
 
diff --git a/open-vm-tools.spec b/open-vm-tools.spec
index 71a25c2..c9dad9b 100644
--- a/open-vm-tools.spec
+++ b/open-vm-tools.spec
@@ -20,7 +20,16 @@
 
 # exclude AMD PCnet32 LANCE pci.id from Supplements list [bnc#397554]
 %define __find_supplements sh -c '/usr/lib/rpm/find-supplements %{name} | grep -v pci:v00001022d00002000'
-%define build_vmxnet3 0%{suse_version} <= 1120
+
+# Modules that have to be build up to version 11.3
+%if 0%{suse_version} <= 1130
+%define mod1130 vmblock vmhgfs vmsync vmxnet vmci vsock
+%endif
+# Modules that are needed up to openSUSE 11.2 (kernel in 11.3 includes them). The previous list is expanded by this.
+%if 0%{suse_version} <= 1120
+%define mod1120 pvscsi vmemctl vmxnet3
+%endif
+
 
 Name:           open-vm-tools
 Group:          System/Emulators/PC
@@ -68,11 +77,7 @@ ExclusiveArch:  %ix86 x86_64
 Requires:       vmware-guest-kmp
 Supplements:    modalias(pci:v000015ADd*sv*sd*bc*sc*i*)
 
-%if %build_vmxnet3
-%define vm_modules vmblock vmhgfs vmmemctl vmsync vmxnet vmci vsock pvscsi vmxnet3
-%else
-%define vm_modules vmblock vmhgfs vmmemctl vmsync vmxnet vmci vsock pvscsi
-%endif
+%define vm_modules %{mod1130} %{mod1120}
 
 %suse_kernel_module_package -n vmware-guest -p %{SOURCE98} xen um