SPECS: VMware-player.spec - updated vmware-any-any-update to 117d - patch V...

[andree]

Author: andree                       Date: Sat Aug 30 17:06:54 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated vmware-any-any-update to 117d
- patch VMware-player-vmnet.patch - allow build on 2.5.25.14
- removed modprobe.d/VMware-player-vmmon.conf (no vmversion in new vmmon module)

---- Files affected:
SPECS:
   VMware-player.spec (1.40 -> 1.41) 

---- Diffs:

================================================================
Index: SPECS/VMware-player.spec
diff -u SPECS/VMware-player.spec:1.40 SPECS/VMware-player.spec:1.41
--- SPECS/VMware-player.spec:1.40	Tue Jul  8 11:21:37 2008
+++ SPECS/VMware-player.spec	Sat Aug 30 19:06:49 2008
@@ -22,7 +22,7 @@
 #
 %define		ver		2.0.3
 %define		buildid	80004
-%define		urel	115a
+%define		urel	117d
 %define		ccver	%(rpm -q --qf '%{V}' gcc)
 %define		_rel	0.14
 #
@@ -39,7 +39,8 @@
 Source1:	http://download3.vmware.com/software/vmplayer/%{name}-%{ver}-%{buildid}.x86_64.tar.gz
 # NoSource1-md5:	
 NoSource:	1
-Source2:	http://rtr.ca/vmware-2.6.24/vmware-any-any-update%{urel}.tgz
+Source2:	http://vmkernelnewbies.googlegroups.com/web/vmware-any-any-update%{urel}.tar.gz
+#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
@@ -50,6 +51,7 @@
 Source8:	%{name}.init
 Patch0:		%{name}-Makefile.patch
 Patch1:		%{name}-run_script.patch
+Patch2:		VMware-player-vmnet.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/
@@ -161,6 +163,12 @@
 cd vmware-any-any-update%{urel}
 tar xf vmmon.tar
 tar xf vmnet.tar
+
+%patch2 -p2
+
+# hack until new any-any-update version available
+sed -i -e 's/#define.*VMMON_VERSION.*/#define VMMON_VERSION		(167 << 16 | 0)/g' vmmon-only/include/iocontrols.h
+
 cp -a vmmon-only{,.clean}
 cp -a vmnet-only{,.clean}
 sed -e 's/filter x86_64%/filter x86_64% amd64% ia64%/' \
@@ -190,9 +198,6 @@
 cd vmware-any-any-update%{urel}
 chmod u+w ../lib/bin/vmware-vmx ../lib/bin-debug/vmware-vmx ../bin/vmnet-bridge
 
-# hack until new any-any-update version available
-sed -i -e 's/#define.*VMMON_VERSION_V6.*/#define VMMON_VERSION_V6		(167 << 16 | 0)/g' vmmon-only.clean/include/iocontrols_compat.h
-
 %if %{with kernel}
 rm -rf built
 mkdir built
@@ -256,9 +261,6 @@
 %endif
 
 %if %{with kernel}
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d
-echo "options vmmon vmversion=16" > $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/%{name}-vmmon.conf
-
 install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/misc
 
 cd vmware-any-any-update%{urel}/built
@@ -442,7 +444,6 @@
 %if %{with kernel}
 %files -n kernel%{_alt_kernel}-misc-vmmon
 %defattr(644,root,root,755)
-%{_sysconfdir}/modprobe.d/%{name}-vmmon.conf
 /lib/modules/%{_kernel_ver}/misc/vmmon.ko*
 
 %files -n kernel%{_alt_kernel}-misc-vmnet
@@ -457,6 +458,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.41  2008/08/30 17:06:49  andree
+- updated vmware-any-any-update to 117d
+- patch VMware-player-vmnet.patch - allow build on 2.5.25.14
+- removed modprobe.d/VMware-player-vmmon.conf (no vmversion in new vmmon module)
+
 Revision 1.40  2008/07/08 09:21:37  blues
 - TODO added
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/VMware-player.spec?r1=1.40&r2=1.41&f=u