X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=VMware-server.spec;h=d5bc48f2e9b43385464379a9f38aa5db60a7c7a1;hb=f4d5d3319ce4b4807ef05ae18c21bb06effe24e9;hp=caa21cae9cb96e3a83853ffefb5ca182d577ae6e;hpb=0491bf0875fad96d8ea07792f8d8a0e962b44f51;p=packages%2FVMware-server.git diff --git a/VMware-server.spec b/VMware-server.spec index caa21ca..d5bc48f 100644 --- a/VMware-server.spec +++ b/VMware-server.spec @@ -13,26 +13,24 @@ # But hey, it's at least free ;-) # # I probably won't have time to work on this, switching to vmware-player. -# +# TODO: +# problem with libsexy/libsexymm: +# ln -s /usr/lib/libsexy.so.2 /usr/lib/libsexy.so.1 +# ln -s /usr/lib/libsexymm.so.2 /usr/lib/libsexymm.so.1 # # Conditional build: %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 1.0.0 -%define _build 28343 +%define _ver 1.0.4 +%define _build 56528 %define _rel 0.1 -%define _urel 104 +%define _urel 115 %define _ccver %(rpm -q --qf "%{VERSION}" gcc) # Summary: VMware Server @@ -43,11 +41,11 @@ Release: %{_rel} License: custom, non-distributable Group: Applications/Emulators Source0: http://download3.vmware.com/software/vmserver/%{name}-%{_ver}-%{_build}.tar.gz -# NoSource0-md5: a25b4beb53785c05ef3b3077d87f6e2b +# NoSource0-md5: 60ec55cd66b77fb202d88bee79baebdf Source1: http://download3.vmware.com/software/vmserver/VMware-mui-%{_ver}-%{_build}.tar.gz -# NoSource1-md5: 0de45c02fcaa30ac41517b687f34b29b +# NoSource1-md5: 6b13063d8ea83c2280549d33da92c476 Source2: http://knihovny.cvut.cz/ftp/pub/vmware/vmware-any-any-update%{_urel}.tar.gz -# NoSource2-md5: 8cba16d3f6b3723b43d555a5f7cbf850 +# NoSource2-md5: ab33ff7a799fee77f0f4ba5667cd4b9a Source3: %{name}.init Source4: %{name}-vmnet.conf Source5: %{name}.png @@ -62,11 +60,13 @@ NoSource: 1 NoSource: 2 URL: http://www.vmware.com/ BuildRequires: gcc-c++ -%{?with_dist_kernel:BuildRequires: kernel-module-build >= 3:2.6.7} +%{?with_dist_kernel:BuildRequires: kernel-module-build >= 3:2.6.20.2} BuildRequires: rpm-perlprov -BuildRequires: rpmbuild(macros) >= 1.268 +BuildRequires: rpmbuild(macros) >= 1.379 BuildRequires: sed >= 4.0 Requires: libgnomecanvasmm +Requires: libsexy +Requires libsexymm ExclusiveArch: %{ix86} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -168,8 +168,8 @@ 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 +%requires_releq_kernel +Requires(postun): %releq_kernel %endif Provides: kernel(vmmon) = %{version}-%{_rel} @@ -187,8 +187,8 @@ 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 +%requires_releq_kernel +Requires(postun): %releq_kernel %endif Provides: kernel(vmnet) = %{version}-%{_rel} @@ -198,128 +198,14 @@ Kernel modules for VMware Server - vmnet. %description -n kernel-misc-vmnet -l pl.UTF-8 Moduły jądra dla VMware Server - vmnet. -%package -n kernel-smp-misc-vmmon -Summary: SMP kernel module for VMware Server -Summary(pl.UTF-8): Moduł jądra SMP dla VMware Server -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 kernel-smp-misc-vmmon -SMP kernel modules fov VMware Server - vmmon-smp. - -%description -n kernel-smp-misc-vmmon -l pl.UTF-8 -Moduły jądra SMP dla VMware Server - vmmon-smp. - -%package -n kernel-smp-misc-vmnet -Summary: SMP kernel module for VMware Server -Summary(pl.UTF-8): Moduł jądra SMP dla VMware Server -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 kernel-smp-misc-vmnet -SMP kernel module for VMware Server - vmnet-smp. - -%description -n kernel-smp-misc-vmnet -l pl.UTF-8 -Moduły jądra SMP dla VMware Server - vmnet-smp. - -%package -n kernel24-misc-vmmon -Summary: Kernel module for VMware Server -Summary(pl.UTF-8): Moduł jądra dla VMware Server -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 Server - vmmon. - -%description -n kernel24-misc-vmmon -l pl.UTF-8 -Moduły jądra dla VMware Server - vmmon. - -%package -n kernel24-misc-vmnet -Summary: Kernel module for VMware Server -Summary(pl.UTF-8): Moduł jądra dla VMware Server -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 Server - vmnet. - -%description -n kernel24-misc-vmnet -l pl.UTF-8 -Moduły jądra dla VMware Server - vmnet. - -%package -n kernel24-smp-misc-vmmon -Summary: SMP kernel module for VMware Server -Summary(pl.UTF-8): Moduł jądra SMP dla VMware Server -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 Server - vmmon-smp. - -%description -n kernel24-smp-misc-vmmon -l pl.UTF-8 -Moduły jądra SMP dla VMware Server - vmmon-smp. - -%package -n kernel24-smp-misc-vmnet -Summary: SMP kernel module for VMware Server -Summary(pl.UTF-8): Moduł jądra SMP dla VMware Server -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 Server - vmnet-smp. - -%description -n kernel24-smp-misc-vmnet -l pl.UTF-8 -Moduły jądra SMP dla VMware Server - vmnet-smp. - %prep %setup -q -n vmware-server-distrib -a1 -a2 tar zxf vmware-mui-distrib/console-distrib/%{name}-console-%{_ver}-%{_build}.tar.gz -#cd vmware-any-any-update%{_urel} +cp vmware-any-any-update%{_urel}/{vmmon,vmnet}.tar lib/modules/source/ cd lib/modules/source tar xf vmmon.tar tar xf vmnet.tar -%patch0 -p0 +#%patch0 -p0 cp -a vmmon-only{,.clean} cp -a vmnet-only{,.clean} cd - @@ -359,9 +245,8 @@ cd lib/modules/source rm -rf built mkdir built -%if !%{with kernel24} for mod in vmmon vmnet ; do - for cfg in %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist}; do + for cfg in %{?with_dist_kernel:dist}%{!?with_dist_kernel:nondist}; do if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then exit 1 fi @@ -399,42 +284,6 @@ for mod in vmmon vmnet ; do cd - done done - -%else -for mod in vmmon vmnet ; do - rm -rf $mod-only - tar xf $mod.tar - cd $mod-only - 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 -%endif # kernel24 - %endif %install @@ -475,31 +324,10 @@ install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/misc #cd vmware-any-any-update%{_urel} cd lib/modules/source -%if !%{with kernel24} -install built/vmmon-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \ +install built/vmmon-%{?with_dist_kernel:dist}%{!?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 \ +install built/vmnet-%{?with_dist_kernel:dist}%{!?with_dist_kernel:nondist}.ko \ $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/vmnet.ko -%if %{with smp} && %{with dist_kernel} -install built/vmmon-smp.ko \ - $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/vmmon.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 @@ -577,42 +405,6 @@ fi %postun -n kernel-misc-vmnet %depmod %{_kernel_ver} -%post -n kernel-smp-misc-vmmon -%depmod %{_kernel_ver}smp - -%postun -n kernel-smp-misc-vmmon -%depmod %{_kernel_ver}smp - -%post -n kernel-smp-misc-vmnet -%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) @@ -703,7 +495,9 @@ fi %attr(755,root,root) %{_bindir}/vmnet-sniffer %attr(755,root,root) %{_bindir}/vmware-ping %dir %{_sysconfdir}/vmware/vmnet8 +%dir %{_sysconfdir}/vmware/vmnet8/dhcpd %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/vmware/vmnet8/dhcpd/dhcpd.conf +%dir %{_sysconfdir}/vmware/vmnet8/nat %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/vmware/vmnet8/nat/nat.conf %verify(not md5 mtime size) %{_sysconfdir}/vmware/vmnet8/dhcpd/dhcpd.leases* @@ -720,7 +514,6 @@ fi %endif %if %{with kernel} -%if !%{with kernel24} %files -n kernel-misc-vmmon %defattr(644,root,root,755) /lib/modules/%{_kernel_ver}/misc/vmmon.ko* @@ -728,36 +521,4 @@ fi %files -n kernel-misc-vmnet %defattr(644,root,root,755) /lib/modules/%{_kernel_ver}/misc/vmnet.ko* - -%if %{with smp} && %{with dist_kernel} -%files -n kernel-smp-misc-vmmon -%defattr(644,root,root,755) -/lib/modules/%{_kernel_ver}smp/misc/vmmon.ko* - -%files -n kernel-smp-misc-vmnet -%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