SPECS: VMware-workstation.spec - _urel 93, reentrant %%build. - fi...

[pluto]

Author: pluto                        Date: Fri Sep 16 10:51:03 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- _urel 93, reentrant %%build.
- fixed kernel capabilites (#define HVW_HAVE_xxx) autodetection.
  (kernel build system passes -Iinclude/asm-$arch/mach-* to vm_check_build
   so we need a simple symlink to fix this issue).

---- Files affected:
SPECS:
   VMware-workstation.spec (1.68 -> 1.69) 

---- Diffs:

================================================================
Index: SPECS/VMware-workstation.spec
diff -u SPECS/VMware-workstation.spec:1.68 SPECS/VMware-workstation.spec:1.69
--- SPECS/VMware-workstation.spec:1.68	Thu Sep 15 20:25:04 2005
+++ SPECS/VMware-workstation.spec	Fri Sep 16 12:50:58 2005
@@ -21,7 +21,7 @@
 %define		_ver	5.0.0
 %define		_build	13124
 %define		_rel	1
-%define		_urel	90
+%define		_urel	93
 #
 Summary:	VMware Workstation
 Summary(pl):	VMware Workstation - wirtualna platforma dla stacji roboczej
@@ -33,7 +33,7 @@
 Source0:	http://download3.vmware.com/software/wkst/%{name}-%{_ver}-%{_build}.tar.gz
 # NoSource0-md5:	91821fc2649749911f0e2d0ca37b3eb8
 Source1:	http://knihovny.cvut.cz/ftp/pub/vmware/vmware-any-any-update%{_urel}.tar.gz
-# Source1-md5:	b8f6498f5275dc8ef3ea2d2e17061ede
+# Source1-md5:	7a33c47bf06f8c88f71ff5131796d321
 Source2:	%{name}.init
 Source3:	%{name}-vmnet.conf
 Source4:	%{name}.png
@@ -41,8 +41,7 @@
 Source6:	%{name}-nat.conf
 Source7:	%{name}-dhcpd.conf
 Patch0:		%{name}-Makefile.patch
-Patch1:		%{name}-compat.patch
-Patch2:		%{name}-run_script.patch
+Patch1:		%{name}-run_script.patch
 NoSource:	0
 URL:		http://www.vmware.com/
 BuildRequires:	gcc-c++
@@ -279,9 +278,10 @@
 tar xf vmmon.tar
 tar xf vmnet.tar
 %patch0 -p0
-%patch1 -p0
+cp -a vmmon-only{,.clean}
+cp -a vmnet-only{,.clean}
 cd -
-%patch2 -p1
+%patch1 -p1
 
 %build
 sed -i 's:vm_db_answer_LIBDIR:VM_LIBDIR:g;s:vm_db_answer_BINDIR:VM_BINDIR:g' bin/vmware
@@ -302,8 +302,6 @@
 mkdir built
 
 %if %{without kernel24}
-cp -a vmmon-only vmmon-only.clean
-cp -a vmnet-only vmnet-only.clean
 for mod in vmmon vmnet ; do
 	for cfg in %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist}; do
 		if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then
@@ -317,6 +315,7 @@
 		ln -sf %{_kernelsrcdir}/config-$cfg .config
 		ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h include/linux/autoconf.h
 		ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm
+		ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm-%{_target_base_arch}
 		ln -sf %{_kernelsrcdir}/Module.symvers-$cfg Module.symvers
 		%{__make} -C %{_kernelsrcdir} modules \
 			VMWARE_VER=VME_V5 \
@@ -635,6 +634,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.69  2005/09/16 10:50:58  pluto
+- _urel 93, reentrant %%build.
+- fixed kernel capabilites (#define HVW_HAVE_xxx) autodetection.
+  (kernel build system passes -Iinclude/asm-$arch/mach-* to vm_check_build
+   so we need a simple symlink to fix this issue).
+
 Revision 1.68  2005/09/15 18:25:04  sparky
 - prepared for kernel >= 2.6.13: link Module.symvers
 
================================================================

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