SPECS: VMware-workstation.spec - recent todo entry done - use inte...

[adamg]

Author: adamg                        Date: Sun Dec 11 03:15:34 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- recent todo entry done - use internal vmmon/vmnet sources

---- Files affected:
SPECS:
   VMware-workstation.spec (1.73 -> 1.74) 

---- Diffs:

================================================================
Index: SPECS/VMware-workstation.spec
diff -u SPECS/VMware-workstation.spec:1.73 SPECS/VMware-workstation.spec:1.74
--- SPECS/VMware-workstation.spec:1.73	Sun Dec 11 03:38:25 2005
+++ SPECS/VMware-workstation.spec	Sun Dec 11 04:15:29 2005
@@ -3,10 +3,6 @@
 # TODO:
 #	- Dependencies
 #	- http://www.vmware.com/support/ws45/doc/devices_linux_kb_ws.html#1040861
-#       - "Version mismatch with vmmon module: expecting 137.0, got 116.0.
-#          You have an incorrect version of the `vmmon' kernel module."
-#         possible solution:
-#         http://www.vmware.com/community/thread.jspa?threadID=27537&tstart=0
 #
 # Conditional build:
 %bcond_without	dist_kernel	# without distribution kernel
@@ -26,6 +22,7 @@
 %define		_build	18463
 %define		_rel	0.1
 %define		_urel	96
+%define		_ccver	%(rpm -q --qf "%{VERSION}" gcc)
 #
 Summary:	VMware Workstation
 Summary(pl):	VMware Workstation - wirtualna platforma dla stacji roboczej
@@ -36,8 +33,8 @@
 Group:		Applications/Emulators
 Source0:	http://download3.vmware.com/software/wkst/%{name}-%{_ver}-%{_build}.tar.gz
 # NoSource0-md5:	d69876f0eb4fe8c286a63c906ff32c34
-Source1:	http://knihovny.cvut.cz/ftp/pub/vmware/vmware-any-any-update%{_urel}.tar.gz
-# Source1-md5:	79dd91c65f3719bb7847d63b314706c3
+#Source1:	http://knihovny.cvut.cz/ftp/pub/vmware/vmware-any-any-update%{_urel}.tar.gz
+## Source1-md5:	79dd91c65f3719bb7847d63b314706c3
 Source2:	%{name}.init
 Source3:	%{name}-vmnet.conf
 Source4:	%{name}.png
@@ -277,11 +274,14 @@
 
 %prep
 %setup -q -n vmware-distrib
-%setup -qDT -n vmware-distrib -a1
+#%setup -qDT -n vmware-distrib -a1
+mkdir vmware-any-any-update%{_urel}
 cd vmware-any-any-update%{_urel}
-tar xf vmmon.tar
-tar xf vmnet.tar
-%patch0 -p0
+#tar xf vmmon.tar
+#tar xf vmnet.tar
+tar xf ../lib/modules/source/vmmon.tar
+tar xf ../lib/modules/source/vmnet.tar
+#%patch0 -p0
 cp -a vmmon-only{,.clean}
 cp -a vmnet-only{,.clean}
 cd -
@@ -325,7 +325,8 @@
 			VMWARE_VER=VME_V5 \
 			M=$PWD O=$PWD \
 			VM_KBUILD=26 \
-			%{?with_verbose:V=1}
+			%{?with_verbose:V=1} \
+			VM_CCVER=%{_ccver}
 		mv -f $mod.ko ../built/$mod-$cfg.ko
 		cd -
 	done
@@ -641,6 +642,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.74  2005/12/11 03:15:29  adamg
+- recent todo entry done - use internal vmmon/vmnet sources
+
 Revision 1.73  2005/12/11 02:38:25  adamg
 - install lib/share/pixmaps
 - todo entry added (do not apply vmware-any-any stuff?)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/VMware-workstation.spec?r1=1.73&r2=1.74&f=u