X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=VMware-workstation.spec;h=0340761512dda96c611535058350b0bba27d2d4b;hb=7b02353c6da45e2a0465d87ac48c78012cd92044;hp=19247c99a7735a20d3ef81dd4a1ae0c5eac40738;hpb=ca3f6c10df359bfd04e1fd6dd45ac96129e0ea30;p=packages%2FVMware-workstation.git

diff --git a/VMware-workstation.spec b/VMware-workstation.spec
index 19247c9..0340761 100644
--- a/VMware-workstation.spec
+++ b/VMware-workstation.spec
@@ -1,19 +1,32 @@
 #
 # TODO:
 #	- Dependencies
+#	- http://www.vmware.com/support/ws45/doc/devices_linux_kb_ws.html#1040861
 #
 # Conditional build:
-%bcond_with	internal_libs	# internal libs stuff
 %bcond_without	dist_kernel	# without distribution kernel
+%bcond_without	kernel		# don't build kernel modules
 %bcond_without	smp		# without SMP kernel modules
+%bcond_without	userspace	# don't build userspace utilities
+%bcond_with	kernel24	# build kernel24 modules (disable kernel26)
+%bcond_with	internal_libs	# internal libs stuff
+%bcond_with	verbose		# verbose build (V=1)
 #
 %include	/usr/lib/rpm/macros.perl
+%if %{with kernel24}
+%define         _kernelsrcdir		/usr/src/linux-2.4
+%endif
 
-%define		_ver	4.5.1
-%define		_build	7568
-%define		_rel	1
-%define		_urel	68
-
+%ifarch %{x8664}
+%undefine	with_userspace
+%endif
+#
+%define		_ver	5.5.1
+%define		_build	19175
+%define		_rel	0.2
+%define		_urel	101
+%define		_ccver	%(rpm -q --qf "%{VERSION}" gcc)
+#
 Summary:	VMware Workstation
 Summary(pl):	VMware Workstation - wirtualna platforma dla stacji roboczej
 Name:		VMware-workstation
@@ -22,22 +35,29 @@ Release:	%{_rel}
 License:	custom, non-distributable
 Group:		Applications/Emulators
 Source0:	http://download3.vmware.com/software/wkst/%{name}-%{_ver}-%{_build}.tar.gz
+# NoSource0-md5:	6101deb381beb49f5b99cb1f8a81a532
 Source1:	http://knihovny.cvut.cz/ftp/pub/vmware/vmware-any-any-update%{_urel}.tar.gz
-# Source1-md5:	89b66ff79e6439945de11dfa9062b17d
+# Source1-md5:	b3ce457f5b9ae8b606fd70f56084877d
 Source2:	%{name}.init
 Source3:	%{name}-vmnet.conf
+Source4:	%{name}.png
+Source5:	%{name}.desktop
+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++
+%{?with_dist_kernel:BuildRequires:	kernel-module-build >= 3:2.6.7}
 BuildRequires:	rpm-perlprov
-BuildRequires:	rpmbuild(macros) >= 1.118
-BuildRequires:	%{kgcc_package}
+BuildRequires:	rpmbuild(macros) >= 1.268
+BuildRequires:	sed >= 4.0
+Requires:	gtk+2 <= 2:2.8.8-1
 Requires:	kernel(vmmon) = %{version}-%{_rel}
-%{?with_dist_kernel:BuildRequires:	kernel-module-build}
-%{?with_dist_kernel:BuildRequires:	kernel-doc}
+Requires:	libgnomecanvasmm
+Requires:	libview >= 0.5.5-2
+ExclusiveArch:	%{ix86} %{x8664}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_noautoprovfiles %{_libdir}/vmware/lib/.*\.so.*
@@ -55,16 +75,16 @@ operacyjnych na jednym zwyk
 rebootowania, bez znacznej utraty wydajno¶ci.
 
 %package debug
-Summary:	TODO
-Summary(pl):	TODO
+Summary:	VMware debug utility
+Summary(pl):	Narzêdzie VMware do odpluskwiania
 Group:		Applications/Emulators
 Requires:	%{name} = %{version}-%{release}
 
 %description debug
-TODO.
+VMware debug utility.
 
 %description debug -l pl
-TODO.
+Narzêdzie VMware do odpluskwiania.
 
 %package help
 Summary:	VMware Workstation help files
@@ -80,39 +100,43 @@ VMware Workstation help files.
 Pliki pomocy dla VMware Workstation.
 
 %package networking
-Summary:	TODO
-Summary(pl):	TODO
+Summary:	VMware networking utilities
+Summary(pl):	Narzêdzia VMware do obs³ugi sieci
 Group:		Applications/Emulators
 Requires:	%{name} = %{version}-%{release}
 Requires:	kernel(vmnet) = %{version}-%{_rel}
+Obsoletes:	VMware-workstation-samba
 
 %description networking
-TODO.
+VMware networking utilities.
 
 %description networking -l pl
-TODO.
+Narzêdzia VMware do obs³ugi sieci.
 
 %package samba
-Summary:	TODO
-Summary(pl):	TODO
+Summary:	VMware SMB utilities
+Summary(pl):	Narzêdzia VMware do SMB
 Group:		Applications/Emulators
 Requires:	%{name} = %{version}-%{release}
 
 %description samba
-TODO.
+VMware SMB utilities.
 
 %description samba -l pl
-TODO.
+Narzêdzia VMware do SMB.
 
 %package -n kernel-misc-vmmon
 Summary:	Kernel module for VMware Workstation
 Summary(pl):	Modu³ j±dra dla VMware Workstation
 Release:	%{_rel}@%{_kernel_ver_str}
 Group:		Base/Kernel
-Provides:	kernel(vmmon) = %{version}-%{_rel}
-Requires:	dev >= 2.9.0-7
 Requires(post,postun):	/sbin/depmod
-%{?with_dist_kernel:%requires_releq_kernel_up}
+Requires:	dev >= 2.9.0-7
+%if %{with dist_kernel}
+%requires_releq_kernel_up
+Requires(postun):	%releq_kernel_up
+%endif
+Provides:	kernel(vmmon) = %{version}-%{_rel}
 
 %description -n kernel-misc-vmmon
 Kernel modules for VMware Workstation - vmmon.
@@ -125,10 +149,13 @@ Summary:	Kernel module for VMware Workstation
 Summary(pl):	Modu³ j±dra dla VMware Workstation
 Release:	%{_rel}@%{_kernel_ver_str}
 Group:		Base/Kernel
-Provides:	kernel(vmnet) = %{version}-%{_rel}
-Requires:	dev >= 2.9.0-7
 Requires(post,postun):	/sbin/depmod
-%{?with_dist_kernel:%requires_releq_kernel_up}
+Requires:	dev >= 2.9.0-7
+%if %{with dist_kernel}
+%requires_releq_kernel_up
+Requires(postun):	%releq_kernel_up
+%endif
+Provides:	kernel(vmnet) = %{version}-%{_rel}
 
 %description -n kernel-misc-vmnet
 Kernel modules for VMware Workstation - vmnet.
@@ -141,9 +168,13 @@ Summary:	SMP kernel module for VMware Workstation
 Summary(pl):	Modu³ j±dra SMP dla VMware Workstation
 Release:	%{_rel}@%{_kernel_ver_str}
 Group:		Base/Kernel
-Provides:	kernel(vmmon) = %{version}-%{_rel}
 Requires(post,postun):	/sbin/depmod
-%{?with_dist_kernel:%requires_releq_kernel_smp}
+Requires:	dev >= 2.9.0-7
+%if %{with dist_kernel}
+%requires_releq_kernel_smp
+Requires(postun):	%releq_kernel_smp
+%endif
+Provides:	kernel(vmmon) = %{version}-%{_rel}
 
 %description -n kernel-smp-misc-vmmon
 SMP kernel modules fov VMware Workstation - vmmon-smp.
@@ -156,9 +187,13 @@ Summary:	SMP kernel module for VMware Workstation
 Summary(pl):	Modu³ j±dra SMP dla VMware Workstation
 Release:	%{_rel}@%{_kernel_ver_str}
 Group:		Base/Kernel
-Provides:	kernel(vmnet) = %{version}-%{_rel}
 Requires(post,postun):	/sbin/depmod
-%{?with_dist_kernel:%requires_releq_kernel_smp}
+Requires:	dev >= 2.9.0-7
+%if %{with dist_kernel}
+%requires_releq_kernel_smp
+Requires(postun):	%releq_kernel_smp
+%endif
+Provides:	kernel(vmnet) = %{version}-%{_rel}
 
 %description -n kernel-smp-misc-vmnet
 SMP kernel module for VMware Workstation - vmnet-smp.
@@ -166,56 +201,217 @@ SMP kernel module for VMware Workstation - vmnet-smp.
 %description -n kernel-smp-misc-vmnet -l pl
 Modu³y j±dra SMP dla VMware Workstation - vmnet-smp.
 
+%package -n kernel24-misc-vmmon
+Summary:	Kernel module for VMware Workstation
+Summary(pl):	Modu³ j±dra dla VMware Workstation
+Release:	%{_rel}@%{_kernel_ver_str}
+Group:		Base/Kernel
+Requires(post,postun):	/sbin/depmod
+Requires:	dev >= 2.9.0-7
+%if %{with dist_kernel}
+%requires_releq_kernel_up
+Requires(postun):	%releq_kernel_up
+%endif
+Provides:	kernel(vmmon) = %{version}-%{_rel}
+
+%description -n kernel24-misc-vmmon
+Kernel modules for VMware Workstation - vmmon.
+
+%description -n kernel24-misc-vmmon -l pl
+Modu³y j±dra dla VMware Workstation - vmmon.
+
+%package -n kernel24-misc-vmnet
+Summary:	Kernel module for VMware Workstation
+Summary(pl):	Modu³ j±dra dla VMware Workstation
+Release:	%{_rel}@%{_kernel_ver_str}
+Group:		Base/Kernel
+Requires(post,postun):	/sbin/depmod
+Requires:	dev >= 2.9.0-7
+%if %{with dist_kernel}
+%requires_releq_kernel_up
+Requires(postun):	%releq_kernel_up
+%endif
+Provides:	kernel(vmnet) = %{version}-%{_rel}
+
+%description -n kernel24-misc-vmnet
+Kernel modules for VMware Workstation - vmnet.
+
+%description -n kernel24-misc-vmnet -l pl
+Modu³y j±dra dla VMware Workstation - vmnet.
+
+%package -n kernel24-smp-misc-vmmon
+Summary:	SMP kernel module for VMware Workstation
+Summary(pl):	Modu³ j±dra SMP dla VMware Workstation
+Release:	%{_rel}@%{_kernel_ver_str}
+Group:		Base/Kernel
+Requires(post,postun):	/sbin/depmod
+Requires:	dev >= 2.9.0-7
+%if %{with dist_kernel}
+%requires_releq_kernel_smp
+Requires(postun):	%releq_kernel_smp
+%endif
+Provides:	kernel(vmmon) = %{version}-%{_rel}
+
+%description -n kernel24-smp-misc-vmmon
+SMP kernel modules fov VMware Workstation - vmmon-smp.
+
+%description -n kernel24-smp-misc-vmmon -l pl
+Modu³y j±dra SMP dla VMware Workstation - vmmon-smp.
+
+%package -n kernel24-smp-misc-vmnet
+Summary:	SMP kernel module for VMware Workstation
+Summary(pl):	Modu³ j±dra SMP dla VMware Workstation
+Release:	%{_rel}@%{_kernel_ver_str}
+Group:		Base/Kernel
+Requires(post,postun):	/sbin/depmod
+Requires:	dev >= 2.9.0-7
+%if %{with dist_kernel}
+%requires_releq_kernel_smp
+Requires(postun):	%releq_kernel_smp
+%endif
+Provides:	kernel(vmnet) = %{version}-%{_rel}
+
+%description -n kernel24-smp-misc-vmnet
+SMP kernel module for VMware Workstation - vmnet-smp.
+
+%description -n kernel24-smp-misc-vmnet -l pl
+Modu³y j±dra SMP dla VMware Workstation - vmnet-smp.
+
 %prep
-%setup -q -n vmware-distrib
+#%setup -q -n vmware-distrib
 %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
-%patch1 -p0
+#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}
+sed -e 's/filter x86_64%/filter x86_64% amd64% ia64%/' \
+	-i vmnet-only.clean/Makefile.kernel
 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
+
 cd vmware-any-any-update%{_urel}
+chmod u+w ../lib/bin/vmware-vmx ../lib/bin-debug/vmware-vmx ../bin/vmnet-bridge
+
+%if 0
+rm -f update
+%{__cc} %{rpmldflags} %{rpmcflags} -o update update.c
+./update vmx		../lib/bin/vmware-vmx
+./update vmxdebug	../lib/bin-debug/vmware-vmx
+./update bridge		../bin/vmnet-bridge
+%endif
+
+%if %{with kernel}
+rm -rf built
 mkdir built
-cp -a vmmon-only vmmon-only.clean
-cp -a vmnet-only vmnet-only.clean
+
+%if %{without kernel24}
 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
-	    exit 1
+	for cfg in %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist}; do
+		if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then
+			exit 1
+		fi
+		rm -rf $mod-only
+		cp -a $mod-only.clean $mod-only
+		cd $mod-only
+		install -d o/include/linux
+		ln -sf %{_kernelsrcdir}/config-$cfg o/.config
+		ln -sf %{_kernelsrcdir}/Module.symvers-$cfg o/Module.symvers
+		ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h o/include/linux/autoconf.h
+	if grep -q "^CONFIG_PREEMPT_RT=y$" o/.config; then
+		sed -e '/pollQueueLock/s/SPIN_LOCK_UNLOCKED/SPIN_LOCK_UNLOCKED(pollQueueLock)/' \
+			-e '/timerLock/s/SPIN_LOCK_UNLOCKED/SPIN_LOCK_UNLOCKED(timerLock)/' \
+			-i ../vmmon-only/linux/driver.c
+		sed -e 's/SPIN_LOCK_UNLOCKED/SPIN_LOCK_UNLOCKED(vnetHubLock)/' \
+			-i ../vmnet-only/hub.c
+		sed -e 's/RW_LOCK_UNLOCKED/RW_LOCK_UNLOCKED(vnetPeerLock)/' \
+			-i ../vmnet-only/driver.c
 	fi
+	%if %{with dist_kernel}
+		%{__make} -C %{_kernelsrcdir} O=$PWD/o prepare scripts
+	%else
+		install -d o/include/config
+		touch o/include/config/MARKER
+		ln -sf %{_kernelsrcdir}/scripts o/scripts
+		%endif
+		%{__make} -C %{_kernelsrcdir} modules \
+			VMWARE_VER=VME_V5 \
+			SRCROOT=$PWD \
+			M=$PWD O=$PWD/o \
+			VM_KBUILD=26 \
+			%{?with_verbose:V=1} \
+			VM_CCVER=%{_ccver}
+		mv -f $mod.ko ../built/$mod-$cfg.ko
+		cd -
+	done
+done
+
+%else
+for mod in vmmon vmnet ; do
 	rm -rf $mod-only
-	cp -a $mod-only.clean $mod-only
+	tar xf ../lib/modules/source/$mod.tar
 	cd $mod-only
-	install -d include/{linux,config}
-	touch include/config/MARKER
-        ln -sf %{_kernelsrcdir}/config-$cfg .config
-        ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h include/linux/autoconf.h
-	ln -sf %{_kernelsrcdir}/include/asm-%{_arch} include/asm
-        %{__make} -C %{_kernelsrcdir} modules \
-    	    SUBDIRS=$PWD O=$PWD \
-	    VM_KBUILD=26
-        mv -f $mod.ko ../built/$mod-$cfg.ko
-	cd -
-    done
+	sed -i s/'^HEADER_DIR.*'/'HEADER_DIR = \/usr\/src\/linux-2.4\/include'/ Makefile
+	sed -i s/'^BUILD_DIR.*'/'BUILD_DIR = .'/ Makefile
+
+%if %{with smp}
+	%{__make} \
+		VM_KBUILD=no VMWARE_VER=VME_V5 \
+		M=$PWD O=$PWD CC=%{kgcc} \
+		INCLUDES="%{rpmcflags} -I. -D__KERNEL_SMP=1 -D__SMP__ -I%{_kernelsrcdir}/include"
+	if [ -e $mod-xxx-* ]; then
+		mv -f $mod-xxx-* ../built/$mod-smp.o
+	else
+		mv -f driver-*/$mod-xxx-* ../built/$mod-smp.o
+	fi
+
+	%{__make} VM_KBUILD=no clean
+%endif
+	%{__make} \
+		VM_KBUILD=no VMWARE_VER=VME_V5 \
+		M=$PWD O=$PWD CC=%{kgcc} \
+		INCLUDES="%{rpmcflags} -I. -I%{_kernelsrcdir}/include"
+	if [ -e $mod-xxx-* ]; then
+		mv -f $mod-xxx-* ../built/$mod.o
+	else
+		mv -f driver-*/$mod-xxx-* ../built/$mod.o
+	fi
+
+	cd ..
 done
-cd -
+%endif # kernel24
+
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
+%if %{with userspace}
 install -d \
 	$RPM_BUILD_ROOT%{_sysconfdir}/vmware \
+	$RPM_BUILD_ROOT%{_sysconfdir}/vmware/vmnet8/{nat,dhcpd} \
 	$RPM_BUILD_ROOT%{_bindir} \
-	$RPM_BUILD_ROOT%{_libdir}/vmware/bin \
+	$RPM_BUILD_ROOT%{_libdir}/vmware/{bin,share/pixmaps} \
 	$RPM_BUILD_ROOT%{_mandir} \
+	$RPM_BUILD_ROOT%{_pixmapsdir} \
+	$RPM_BUILD_ROOT%{_desktopdir} \
 	$RPM_BUILD_ROOT/etc/rc.d/init.d \
-	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/misc \
 	$RPM_BUILD_ROOT/var/run/vmware
+%endif
+
+%if %{with kernel}
+install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/misc
 
 cd vmware-any-any-update%{_urel}
+
+%if %{without kernel24}
 install built/vmmon-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
 	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/vmmon.ko
 install built/vmnet-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
@@ -226,19 +422,42 @@ install built/vmmon-smp.ko \
 install built/vmnet-smp.ko \
 	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/vmnet.ko
 %endif
+
+%else
+install built/vmmon.o \
+	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/vmmon.o
+install built/vmnet.o \
+	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/vmnet.o
+%if %{with smp} && %{with dist_kernel}
+install built/vmmon-smp.o \
+	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/vmmon.o
+install built/vmnet-smp.o \
+	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/vmnet.o
+%endif
+
+%endif
+
 cd -
+%endif
 
+%if %{with userspace}
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/vmnet
-install %{SOURCE3} $RPM_BUILD_ROOT/etc/vmware/vmnet.conf
+install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/vmware/vmnet.conf
+install %{SOURCE4} $RPM_BUILD_ROOT%{_pixmapsdir}
+install %{SOURCE5} $RPM_BUILD_ROOT%{_desktopdir}
+install %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/vmware/vmnet8/nat/nat.conf
+install %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/vmware/vmnet8/dhcpd/dhcpd.conf
 
-cp	bin/*-* $RPM_BUILD_ROOT%{_bindir}
+touch $RPM_BUILD_ROOT%{_sysconfdir}/vmware/vmnet8/dhcpd/dhcpd.leases
+touch $RPM_BUILD_ROOT%{_sysconfdir}/vmware/vmnet8/dhcpd/dhcpd.leases~
 
-cp	lib/bin/vmware $RPM_BUILD_ROOT%{_bindir}
+install lib/share/pixmaps/* $RPM_BUILD_ROOT%{_libdir}/vmware/share/pixmaps
 
-cp -r	lib/bin/vmware-vmx \
-	$RPM_BUILD_ROOT%{_libdir}/vmware/bin
+install bin/*-* $RPM_BUILD_ROOT%{_bindir}
+install lib/bin/vmware-vmx $RPM_BUILD_ROOT%{_libdir}/vmware/bin
 
-cp -r	lib/{bin-debug,config,floppies,help*,isoimages,licenses,messages,smb,xkeymap} \
+#cp -r	lib/{bin-debug,config,floppies,help*,isoimages,licenses,messages,smb,xkeymap} \
+cp -r	lib/{bin-debug,config,floppies,help*,isoimages,licenses,messages,xkeymap} \
 	$RPM_BUILD_ROOT%{_libdir}/vmware
 
 cp -r	man/* $RPM_BUILD_ROOT%{_mandir}
@@ -250,8 +469,13 @@ VM_LIBDIR=%{_libdir}/vmware
 EOF
 
 %if %{with internal_libs}
-cp	bin/vmware $RPM_BUILD_ROOT%{_bindir}/vmware.sh
+install bin/vmware $RPM_BUILD_ROOT%{_bindir}
+install lib/bin/vmware $RPM_BUILD_ROOT%{_libdir}/vmware/bin
 cp -r	lib/lib $RPM_BUILD_ROOT%{_libdir}/vmware
+cp -r	lib/libconf $RPM_BUILD_ROOT%{_libdir}/vmware
+%else
+install lib/bin/vmware $RPM_BUILD_ROOT%{_bindir}
+%endif
 %endif
 
 %clean
@@ -259,17 +483,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %post networking
 /sbin/chkconfig --add vmnet
-if [ -r /var/lock/subsys/vmnet ]; then
-	/etc/rc.d/init.d/vmnet restart >&2
-else
-	echo "Run \"/etc/rc.d/init.d/vmnet start\" to start VMware networking service."
-fi
+%service vmnet restart "VMware networking service"
 
 %preun networking
 if [ "$1" = "0" ]; then
-	if [ -r /var/lock/subsys/vmnet ]; then
-		/etc/rc.d/init.d/vmnet stop >&2
-	fi
+	%service vmnet stop
 	/sbin/chkconfig --del vmnet
 fi
 
@@ -286,27 +504,51 @@ fi
 %depmod %{_kernel_ver}
 
 %post	-n kernel-smp-misc-vmmon
-%depmod %{_kernel_ver}
+%depmod %{_kernel_ver}smp
 
 %postun -n kernel-smp-misc-vmmon
-%depmod %{_kernel_ver}
+%depmod %{_kernel_ver}smp
 
 %post	-n kernel-smp-misc-vmnet
-%depmod %{_kernel_ver}
+%depmod %{_kernel_ver}smp
 
 %postun -n kernel-smp-misc-vmnet
+%depmod %{_kernel_ver}smp
+
+%post	-n kernel24-misc-vmmon
+%depmod %{_kernel_ver}
+
+%postun -n kernel24-misc-vmmon
 %depmod %{_kernel_ver}
 
+%post	-n kernel24-misc-vmnet
+%depmod %{_kernel_ver}
+
+%postun -n kernel24-misc-vmnet
+%depmod %{_kernel_ver}
+
+%post	-n kernel24-smp-misc-vmmon
+%depmod %{_kernel_ver}smp
+
+%postun -n kernel24-smp-misc-vmmon
+%depmod %{_kernel_ver}smp
+
+%post	-n kernel24-smp-misc-vmnet
+%depmod %{_kernel_ver}smp
+
+%postun -n kernel24-smp-misc-vmnet
+%depmod %{_kernel_ver}smp
+
+%if %{with userspace}
 %files
 %defattr(644,root,root,755)
 %doc doc/* lib/configurator/vmnet-{dhcpd,nat}.conf
 %dir %{_sysconfdir}/vmware
 %{_sysconfdir}/vmware/locations
 %attr(755,root,root) %{_bindir}/vmware
-%{?with_internal_libs:%attr(755,root,root) %{_bindir}/vmware.sh}
 %attr(755,root,root) %{_bindir}/vmware-loop
 %attr(755,root,root) %{_bindir}/vmware-mount.pl
-%attr(755,root,root) %{_bindir}/vmware-wizard
+%attr(755,root,root) %{_bindir}/vmware-vdiskmanager
 %dir %{_libdir}/vmware
 %dir %{_libdir}/vmware/bin
 # warning: SUID !!!
@@ -314,14 +556,22 @@ fi
 %{_libdir}/vmware/config
 %{_libdir}/vmware/floppies
 %{_libdir}/vmware/isoimages
-%{?with_internal_libs:%{_libdir}/vmware/lib}
+%if %{with internal_libs}
+%attr(755,root,root) %{_libdir}/vmware/bin/vmware
+%dir %{_libdir}/vmware/lib
+%{_libdir}/vmware/lib/lib*
+%attr(755,root,root) %{_libdir}/vmware/lib/wrapper-gtk24.sh
+%endif
 %{_libdir}/vmware/licenses
 %dir %{_libdir}/vmware/messages
 %{_libdir}/vmware/messages/en
 %lang(ja) %{_libdir}/vmware/messages/ja
+%{_libdir}/vmware/share
 %{_libdir}/vmware/xkeymap
 %{_mandir}/man1/*
 %attr(1777,root,root) %dir /var/run/vmware
+%{_pixmapsdir}/*.png
+%{_desktopdir}/%{name}.desktop
 
 %files debug
 %defattr(644,root,root,755)
@@ -335,7 +585,7 @@ fi
 
 %files networking
 %defattr(644,root,root,755)
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/vmware/vmnet.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/vmware/vmnet.conf
 %attr(754,root,root) /etc/rc.d/init.d/vmnet
 %attr(755,root,root) %{_bindir}/vmnet-bridge
 %attr(755,root,root) %{_bindir}/vmnet-dhcpd
@@ -343,7 +593,12 @@ fi
 %attr(755,root,root) %{_bindir}/vmnet-netifup
 %attr(755,root,root) %{_bindir}/vmnet-sniffer
 %attr(755,root,root) %{_bindir}/vmware-ping
+%dir %{_sysconfdir}/vmware/vmnet8
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/vmware/vmnet8/dhcpd/dhcpd.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/vmware/vmnet8/nat/nat.conf
+%verify(not md5 mtime size) %{_sysconfdir}/vmware/vmnet8/dhcpd/dhcpd.leases*
 
+%if 0
 %files samba
 %defattr(644,root,root,755)
 %doc lib/configurator/vmnet-smb.conf
@@ -352,7 +607,11 @@ fi
 %attr(755,root,root) %{_bindir}/vmware-smbpasswd
 %attr(755,root,root) %{_bindir}/vmware-smbpasswd.bin
 %{_libdir}/vmware/smb
+%endif
+%endif
 
+%if %{with kernel}
+%if %{without kernel24}
 %files -n kernel-misc-vmmon
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/misc/vmmon.ko*
@@ -370,3 +629,26 @@ fi
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}smp/misc/vmnet.ko*
 %endif
+
+%else
+%files -n kernel24-misc-vmmon
+%defattr(644,root,root,755)
+/lib/modules/%{_kernel_ver}/misc/vmmon.o*
+
+%files -n kernel24-misc-vmnet
+%defattr(644,root,root,755)
+/lib/modules/%{_kernel_ver}/misc/vmnet.o*
+
+%if %{with smp} && %{with dist_kernel}
+%files	-n kernel24-smp-misc-vmmon
+%defattr(644,root,root,755)
+/lib/modules/%{_kernel_ver}smp/misc/vmmon.o*
+
+%files	-n kernel24-smp-misc-vmnet
+%defattr(644,root,root,755)
+/lib/modules/%{_kernel_ver}smp/misc/vmnet.o*
+%endif
+
+%endif
+
+%endif