Fix build

OBS-URL: https://build.opensuse.org/package/show/Virtualization:VMware/open-vm-tools?expand=0&rev=181

open-vm-tools.changes

@@ -8,12 +8,26 @@ Thu Apr 14 19:35:44 UTC 2011 - dimstar@opensuse.org
   + The VMCI driver was thoroughly reworked so that it can serve as
     both the host and guest VMCI driver. This is mostly targeted at
     supporting nested VMs.
-  + vmusr got better integration with X's session manager, including
-    proper cleanup during session teardown.
-  + Unity has been enhanced to better handle some desktop environments.
-  + Many small bug fixes in other areas, including updates for newer
-    Linux kernels.
-
+  + vmusr got better integration with X's session manager,
+    including proper cleanup during session teardown.
+  + Unity has been enhanced to better handle some desktop
+    environments.
+  + Many small bug fixes in other areas, including updates for
+    newer Linux kernels.
+- Changes from 2011.02.23:
+  + Some copy & paste issues with KDE were fixed.
+  + Mostly cleanups and bug fixes, with a few build enhancements.
+- Changes from 2011.01.24:
+  + Mostly cleanups and bug fixes.
+  + Install code fixed to handle translation catalogs correctly.
+- No longer care for missing modules on openSUSE 11.2. It is EOL in
+  a few weeks. As a consequence, remove the sources (they are in
+  current kernels):
+  + pvscsi.tar.bz2
+  + vmxnet3.tar.bz2
+  + vmemctl.tar.bz2
+- Fix some lint warnings: obsolete only <, not <=, Add PreReq:
+  permissions to the -gui package.
 
 -------------------------------------------------------------------
 Thu Apr 14 16:30:29 UTC 2011 - dimstar@opensuse.org

open-vm-tools.spec

@@ -25,12 +25,8 @@
 %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
-%define mod1120 pvscsi vmmemctl vmxnet3
-%endif
 
-# X modules are failing all the time the build currently. We need an easy way to enable/disable them.
+# X modules are lower prio upstream and once in a while fail. Offer an easy way to enable/disable them.
 %define with_X 1
 
 Name:           open-vm-tools
@@ -48,14 +44,6 @@ Source3:        vmware-toolbox.desktop
 Source4:        open-vm-tools.permissions
 Source5:        vmware-user-autostart-wrapper
 Source6:        open-vm-tools-modprobe.conf
-# VMXNET3 driver is extracted from open-vm-tools 2009.12,16 last one that carried it.
-# We keep it in for compatibility of older openSUSE Releases that have a kernel < 2.26.32. From then on, 
-# vmxnet3 is part of the kernel.
-Source7:        vmxnet3.tar.bz2
-# vmmemctl.tar.bz2 is extracted from open-vm-tools 2010.02.23
-Source8:        vmmemctl.tar.bz2
-# pvscsi, extracted from open-vm-tools 2010.03.18
-Source9:        pvscsi.tar.bz2
 Source98:       preamble
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  gcc-c++
@@ -146,6 +134,7 @@ Summary:        Open Virtual Machine Tools - GUI
 Group:          System/Emulators/PC
 Requires:       open-vm-tools
 Supplements:    packageand(open-vm-tools:xorg-x11)
+PreReq:         permissions
 
 %description gui
 GUI Toolbox for Open Virtual Machine Tools
@@ -172,19 +161,11 @@ if you intend to create own plugins for vmtoolsd.
 
 %prep
 %setup -q -n %{name}-%{version}-%{svn_rev}
-pushd modules/linux
-tar xvf %{S:7}
-tar xvf %{S:8}
-tar xvf %{S:9}
-popd
 chmod -x AUTHORS COPYING ChangeLog NEWS README
 # fix for an rpmlint warning regarding wrong line feeds
 sed -i -e "s/\r//" README
 
 %build
-# Bool is not char, but bool...
-#sed -i "s/typedef.*char.*Bool/typedef int Bool/" lib/include/vm_basic_types.h
-
 # comments in a continued line seem not to work... shame
 # --disable-unity : liburiparser was not present before 11.0
 %configure \
@@ -348,7 +329,6 @@ rm -rf %{buildroot}
 %if 0%{?suse_version} >= 1140
 %{_libdir}/%{name}/plugins/vmusr/libunity.so
 %endif
-%{_libdir}/%{name}/plugins/vmusr/libvixUser.so
 %{_bindir}/vmware-user-autostart-wrapper
 %endif
 

preamble

@@ -1,7 +1,7 @@
 Enhances: kernel-%1
 Requires: kernel-%1
 Recommends: open-vm-tools
-Obsoletes: vmware-kmp <= %(echo %{-v*}-%2 | tr - _)
-Obsoletes: vmware-kmp-%1 <= %(echo %{-v*}-%2 | tr - _)
+Obsoletes: vmware-kmp < %(echo %{-v*}-%2 | tr - _)
+Obsoletes: vmware-kmp-%1 < %(echo %{-v*}-%2 | tr - _)
 Provides: vmware-kmp = %(echo %{-v*}-%2 | tr - _)
 Provides: vmware-kmp-%1 = %(echo %{-v*}-%2 | tr - _)

pvscsi.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9bab6b73130d6a6a66e7549c5c794f016d8ca1267b65dbf4ce0f1a2b57214559
-size 41129

vmmemctl.tar.bz2

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

vmxnet3.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8009d53dde71c4f99f4b1c61194682c97069506cf637beb743c670e97d18a979
-size 39147