Dominique Leuenberger 2011-04-14 16:38:44 +00:00 committed by Git OBS Bridge
parent 7e5785c38b
commit 7de3ca03e4
4 changed files with 16 additions and 10 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2e1d60a21ef573b5b6642c0434e1c01830328b3ce2a95606a3c1fb9e7aa72112
size 2528090

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:04c40a4cd9e4c5ee4f3ef8f743df4899aa82705e698a32b85d95f9516ee1f0fc
size 2561079

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Apr 14 16:30:29 UTC 2011 - dimstar@opensuse.org
- Fix build with Factory: verify the list of modules that are not
yet merged into the main kernel.
-------------------------------------------------------------------
Wed Dec 22 08:29:03 UTC 2010 - dimstar@opensuse.org

View File

@ -1,5 +1,5 @@
#
# spec file for package open-vm-tools (Version 2010.11.17)
# spec file for package open-vm-tools (Version 2010.12.19)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (C) 2010 Dominique Leuenberger, Amsterdam, Netherlands.
@ -21,9 +21,9 @@
# 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'
# Modules that have to be build up to version 11.3
%if 0%{suse_version} <= 1140
%define mod1140 vmblock vmhgfs vmsync vmxnet vmci vsock
# Modules that have to be build up to version 12.1 (Last checked on 2011-04-14 with kernel 2.6.38)
%if 0%{suse_version} <= 1210
%define mod1210 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 extended by this.
%if 0%{suse_version} <= 1120
@ -36,9 +36,9 @@
Name: open-vm-tools
Group: System/Emulators/PC
Summary: Open Virtual Machine Tools
Version: 2010.12.19
Version: 2011.02.23
Release: 1
%define svn_rev 339835
%define svn_rev 368700
Url: http://open-vm-tools.sourceforge.net/
License: BSD3c ; GPLv2 ; LGPLv2.1
Source: %{name}-%{version}-%{svn_rev}.tar.bz2
@ -81,7 +81,7 @@ ExclusiveArch: %ix86 x86_64
Requires: vmware-guest-kmp
Supplements: modalias(pci:v000015ADd*sv*sd*bc*sc*i*)
%define vm_modules %{?mod1140} %{?mod1130} %{?mod1120}
%define vm_modules %{?mod1210} %{?mod1120}
%suse_kernel_module_package -n vmware-guest -p %{SOURCE98} xen um