- allow to compile with kernels >= 2.6.24

- rel. 0.14

Changed files:
    VMware-player-Makefile.patch -> 1.3
    VMware-player.spec -> 1.39
    vmware-any-any-update115-to-115a.patch -> 1.1

diff --git a/VMware-player-Makefile.patch b/VMware-player-Makefile.patch
index 04e76cebb868634e31fb591ad9382f1f9e7c9971..9365083b30704f7386b8bab6347236ab0ba031d9 100644 (file)
--- a/VMware-player-Makefile.patch
+++ b/VMware-player-Makefile.patch
@@ -1,5 +1,5 @@
---- vmware-player-distrib/vmware-any-any-update115/vmmon-only/Makefile 2007-11-28 12:39:37.000000000 +0200
-+++ vmware-player-distrib-new/vmware-any-any-update115/vmmon-only/Makefile     2007-12-17 02:21:20.665830641 +0200
+--- vmware-player-distrib/vmware-any-any-update115a/vmmon-only/Makefile        2007-11-28 12:39:37.000000000 +0200
++++ vmware-player-distrib-new/vmware-any-any-update115a/vmmon-only/Makefile    2007-12-17 02:21:20.665830641 +0200
 @@ -15,9 +15,9 @@
  VM_UNAME = $(shell uname -r)
  
@@ -102,8 +102,8 @@
  else
  
  include $(SRCROOT)/Makefile.normal
---- vmware-player-distrib/vmware-any-any-update115/vmnet-only/Makefile 2007-11-28 12:19:12.000000000 +0200
-+++ vmware-player-distrib-new/vmware-any-any-update115/vmnet-only/Makefile     2007-12-17 02:19:06.321685076 +0200
+--- vmware-player-distrib/vmware-any-any-update115a/vmnet-only/Makefile        2007-11-28 12:19:12.000000000 +0200
++++ vmware-player-distrib-new/vmware-any-any-update115a/vmnet-only/Makefile    2007-12-17 02:19:06.321685076 +0200
 @@ -15,9 +15,9 @@
  VM_UNAME = $(shell uname -r)
  

diff --git a/VMware-player.spec b/VMware-player.spec
index 517a18ab10e38c9fa07adcd09c85f0475751ca1c..28981d0a6f17acf2e5ba7e36bbd7be623994ed30 100644 (file)
--- a/VMware-player.spec
+++ b/VMware-player.spec
@@ -17,9 +17,9 @@
 #
 %define                ver             2.0.3
 %define                buildid 80004
-%define                urel    115
+%define                urel    115a
 %define                ccver   %(rpm -q --qf '%{V}' gcc)
-%define                _rel    0.13
+%define                _rel    0.14
 #
 Summary:       VMware player
 Summary(pl.UTF-8):     VMware player - wirtualna platforma dla stacji roboczej
@@ -34,8 +34,9 @@ NoSource:     0
 Source1:       http://download3.vmware.com/software/vmplayer/%{name}-%{ver}-%{buildid}.x86_64.tar.gz
 # NoSource1-md5:       
 NoSource:      1
-Source2:       http://knihovny.cvut.cz/ftp/pub/vmware/vmware-any-any-update%{urel}.tar.gz
-# Source2-md5: ab33ff7a799fee77f0f4ba5667cd4b9a
+Source2:       http://rtr.ca/vmware-2.6.24/vmware-any-any-update%{urel}.tgz
+# Source2-md5: d0433cf49589e0140ed6730ad790de3a
+# original any-any: http://knihovny.cvut.cz/ftp/pub/vmware/vmware-any-any-update%{urel}.tar.gz
 Source3:       %{name}-vmnet.conf
 Source4:       %{name}.png
 Source5:       %{name}.desktop
@@ -44,6 +45,8 @@ Source7:      %{name}-dhcpd.conf
 Source8:       %{name}.init
 Patch0:                %{name}-Makefile.patch
 Patch1:                %{name}-run_script.patch
+# patch below is included only for showing differences between 115 and 115a and not used for patching
+Patch100:      vmware-any-any-update115-to-115a.patch  
 URL:           http://www.vmware.com/
 %{?with_dist_kernel:BuildRequires:     kernel%{_alt_kernel}-module-build >= 3:2.6.7}
 BuildRequires: libstdc++-devel

diff --git a/vmware-any-any-update115-to-115a.patch b/vmware-any-any-update115-to-115a.patch
new file mode 100644 (file)
index 0000000..9ef2249
--- /dev/null
+++ b/vmware-any-any-update115-to-115a.patch
@@ -0,0 +1,25 @@
+diff -Nru vmware-any-any-update115/vmmon-only/include/iocontrols_compat.h vmware-any-any-update115a/vmmon-only/include/iocontrols_compat.h
+--- vmware-any-any-update115/vmmon-only/include/iocontrols_compat.h    2007-07-23 11:59:47.000000000 +0200
++++ vmware-any-any-update115a/vmmon-only/include/iocontrols_compat.h   2007-12-01 16:55:10.000000000 +0100
+@@ -15,7 +15,7 @@
+ #define VMMON_VERSION_V5        (116 << 16 | 0)
+ #define VMMON_VERSION_V55       (137 << 16 | 0)
+ #define VMMON_VERSION_S1B1      (138 << 16 | 0)
+-#define VMMON_VERSION_V6        (161 << 16 | 0)
++#define VMMON_VERSION_V6        (167 << 16 | 0)
+ 
+ /*
+  * Limit structure for CREATE_VM
+diff -Nru vmware-any-any-update115/vmmon-only/include/vcpuset.h vmware-any-any-update115a/vmmon-only/include/vcpuset.h
+--- vmware-any-any-update115/vmmon-only/include/vcpuset.h      2007-07-22 13:21:17.000000000 +0200
++++ vmware-any-any-update115a/vmmon-only/include/vcpuset.h     2007-12-01 16:52:11.000000000 +0100
+@@ -71,7 +71,7 @@
+ #define ffs(x) ffs_x86_64(x)
+ 
+ #elif defined MODULE
+-   #include "asm/bitops.h"
++   #include "linux/bitops.h"
+ #elif defined __APPLE__ && defined KERNEL
+    /* 
+     * XXXMACOS An ugly hack to resolve redefinition of PAGE_ defines 
+Files vmware-any-any-update115/vmmon.tar and vmware-any-any-update115a/vmmon.tar differ