]> git.pld-linux.org Git - packages/VMware-server.git/blobdiff - VMware-server.spec
- Th deps:
[packages/VMware-server.git] / VMware-server.spec
index ebbd8db0f2ce5adc35e1289bc78f7b63f5065df1..472c9fa9b229c4cb4615d3e7dfde681913704123 100644 (file)
 # 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    e.x.p
-%define                _build  20925
-%define                _rel    1
-%define                _urel   98
+%define                _ver    1.0.3
+%define                _build  44356
+%define                _rel    0.1
+%define                _urel   110
+%define                _ccver  %(rpm -q --qf "%{VERSION}" gcc)
 #
 Summary:       VMware Server
-Summary(pl):   VMware Server - wirtualna platforma dla stacji roboczej
+Summary(pl.UTF-8):     VMware Server - wirtualna platforma dla stacji roboczej
 Name:          VMware-server
-Version:       0.%{_ver}.%{_build}
+Version:       %{_ver}.%{_build}
 Release:       %{_rel}
 License:       custom, non-distributable
 Group:         Applications/Emulators
 Source0:       http://download3.vmware.com/software/vmserver/%{name}-%{_ver}-%{_build}.tar.gz
-# NoSource0-md5:       91821fc2649749911f0e2d0ca37b3eb8
+# NoSource0-md5:       536a289e3a67cab7874fd5b12885cbf3
 Source1:       http://download3.vmware.com/software/vmserver/VMware-mui-%{_ver}-%{_build}.tar.gz
-# NoSource1-md5:       91821fc2649749911f0e2d0ca37b3eb8
+# NoSource1-md5:       c46f8044ddd3f4c40133ad8b84e57b69
 Source2:       http://knihovny.cvut.cz/ftp/pub/vmware/vmware-any-any-update%{_urel}.tar.gz
-# Source2-md5: 3c5f275d57a812276eec8446b94afd53
+# NoSource2-md5:       6a0c8da95b4c25670c842939e5b92728
 Source3:       %{name}.init
 Source4:       %{name}-vmnet.conf
 Source5:       %{name}.png
@@ -55,14 +51,16 @@ Source7:    %{name}-nat.conf
 Source8:       %{name}-dhcpd.conf
 Patch0:                %{name}-Makefile.patch
 Patch1:                %{name}-run_script.patch
+Patch2:                %{name}-init_pl.patch
 NoSource:      0
+NoSource:      1
+NoSource:      2
 URL:           http://www.vmware.com/
 BuildRequires: gcc-c++
-%{?with_dist_kernel:BuildRequires:     kernel-module-build >= 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:      kernel(vmmon) = %{version}-%{_rel}
 Requires:      libgnomecanvasmm
 ExclusiveArch: %{ix86}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -75,39 +73,39 @@ multiple guest operating systems to run concurrently on a single
 standard PC, without repartitioning or rebooting, and without
 significant loss of performance.
 
-%description -l pl
+%description -l pl.UTF-8
 VMware Server Virtual Platform to cienka warstwa oprogramowania
-pozwalaj±ca na jednoczesne dzia³anie wielu go¶cinnych systemów
-operacyjnych na jednym zwyk³ym PC, bez repartycjonowania ani
-rebootowania, bez znacznej utraty wydajnoci.
+pozwalająca na jednoczesne działanie wielu gościnnych systemów
+operacyjnych na jednym zwykłym PC, bez repartycjonowania ani
+rebootowania, bez znacznej utraty wydajności.
 
 %package debug
 Summary:       VMware debug utility
-Summary(pl):   Narzêdzie VMware do odpluskwiania
+Summary(pl.UTF-8):     Narzędzie VMware do odpluskwiania
 Group:         Applications/Emulators
 Requires:      %{name} = %{version}-%{release}
 
 %description debug
 VMware debug utility.
 
-%description debug -l pl
-Narzêdzie VMware do odpluskwiania.
+%description debug -l pl.UTF-8
+Narzędzie VMware do odpluskwiania.
 
 %package console
 Summary:       VMware console utility
-Summary(pl):   Konsola VMware
+Summary(pl.UTF-8):     Konsola VMware
 Group:         Applications/Emulators
 Requires:      %{name} = %{version}-%{release}
 
 %description console
 A tool for controlling VM.
 
-%description console -l pl
-Narzêdzie VMware do kontroli VM.
+%description console -l pl.UTF-8
+Narzędzie VMware do kontroli VM.
 
 %package help
 Summary:       VMware Server help files
-Summary(pl):   Pliki pomocy dla VMware Server
+Summary(pl.UTF-8):     Pliki pomocy dla VMware Server
 Group:         Applications/Emulators
 Requires:      %{name} = %{version}-%{release}
 Requires:      mozilla
@@ -115,12 +113,12 @@ Requires: mozilla
 %description help
 VMware Server help files.
 
-%description help -l pl
+%description help -l pl.UTF-8
 Pliki pomocy dla VMware Server.
 
 %package console-help
 Summary:       VMware Server console help files
-Summary(pl):   Pliki pomocy dla konsoli VMware Server
+Summary(pl.UTF-8):     Pliki pomocy dla konsoli VMware Server
 Group:         Applications/Emulators
 Requires:      %{name} = %{version}-%{release}
 Requires:      mozilla
@@ -128,198 +126,87 @@ Requires:        mozilla
 %description console-help
 VMware Server console help files.
 
-%description console-help -l pl
+%description console-help -l pl.UTF-8
 Pliki pomocy dla konsoli VMware Server.
 
 %package networking
 Summary:       VMware networking utilities
-Summary(pl):   Narzêdzia VMware do obs³ugi sieci
+Summary(pl.UTF-8):     Narzędzia VMware do obsługi sieci
 Group:         Applications/Emulators
+Requires(post,preun):  /sbin/chkconfig
 #Requires:     %{name} = %{version}-%{release}
-Requires:      kernel(vmnet) = %{version}-%{_rel}
+Requires:      rc-scripts
 
 %description networking
 VMware networking utilities.
 
-%description networking -l pl
-Narzêdzia VMware do obs³ugi sieci.
+%description networking -l pl.UTF-8
+Narzędzia VMware do obsługi sieci.
 
 %package samba
 Summary:       VMware SMB utilities
-Summary(pl):   Narzêdzia VMware do SMB
+Summary(pl.UTF-8):     Narzędzia VMware do SMB
 Group:         Applications/Emulators
 Requires:      %{name} = %{version}-%{release}
 
 %description samba
 VMware SMB utilities.
 
-%description samba -l pl
-Narzêdzia VMware do SMB.
+%description samba -l pl.UTF-8
+Narzędzia VMware do SMB.
 
 %package -n kernel-misc-vmmon
 Summary:       Kernel module for VMware Server
-Summary(pl):   Modu³ j±dra dla 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
+%requires_releq_kernel
+Requires(postun):      %releq_kernel
 %endif
 Provides:      kernel(vmmon) = %{version}-%{_rel}
 
 %description -n kernel-misc-vmmon
 Kernel modules for VMware Server - vmmon.
 
-%description -n kernel-misc-vmmon -l pl
-Modu³y j±dra dla VMware Server - vmmon.
+%description -n kernel-misc-vmmon -l pl.UTF-8
+Moduły jądra dla VMware Server - vmmon.
 
 %package -n kernel-misc-vmnet
 Summary:       Kernel module for VMware Server
-Summary(pl):   Modu³ j±dra dla 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
+%requires_releq_kernel
+Requires(postun):      %releq_kernel
 %endif
 Provides:      kernel(vmnet) = %{version}-%{_rel}
 
 %description -n kernel-misc-vmnet
 Kernel modules for VMware Server - vmnet.
 
-%description -n kernel-misc-vmnet -l pl
-Modu³y j±dra dla VMware Server - vmnet.
-
-%package -n kernel-smp-misc-vmmon
-Summary:       SMP kernel module for VMware Server
-Summary(pl):   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
-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):   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
-Modu³y j±dra SMP dla VMware Server - vmnet-smp.
-
-%package -n kernel24-misc-vmmon
-Summary:       Kernel module for VMware Server
-Summary(pl):   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
-Modu³y j±dra dla VMware Server - vmmon.
-
-%package -n kernel24-misc-vmnet
-Summary:       Kernel module for VMware Server
-Summary(pl):   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
-Modu³y j±dra dla VMware Server - vmnet.
-
-%package -n kernel24-smp-misc-vmmon
-Summary:       SMP kernel module for VMware Server
-Summary(pl):   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
-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):   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
-Modu³y j±dra SMP dla VMware Server - vmnet-smp.
+%description -n kernel-misc-vmnet -l pl.UTF-8
+Moduły jądra dla VMware Server - vmnet.
 
 %prep
 %setup -q -n vmware-server-distrib -a1 -a2
-tar zxf vmware-mui-distrib/console-distrib/VMware-console-%{_ver}-%{_build}.tar.gz
-#cd vmware-any-any-update%{_urel}
+tar zxf vmware-mui-distrib/console-distrib/%{name}-console-%{_ver}-%{_build}.tar.gz
+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 -
 %patch1 -p1
+%patch2 -p0
+tar xf lib/perl/control.tar
 
 %build
 sed -i 's:vm_db_answer_LIBDIR:VM_LIBDIR:g;s:vm_db_answer_BINDIR:VM_BINDIR:g' bin/vmware
@@ -336,72 +223,62 @@ rm -f update
 %endif
 cd -
 
+%if %{with userspace}
+       cd control-only
+       perl Makefile.PL
+       sed -i "s:^INSTALLSITEARCH.*$:INSTALLSITEARCH = %{perl_vendorarch}:" Makefile
+       sed -i "s:^INSTALLSITELIB.*$:INSTALLSITELIB = %{perl_vendorlib}:" Makefile
+       sed -i "s:^INSTALLSITEMAN1DIR.*$:INSTALLSITEMAN1DIR = %{_mandir}/man1:" Makefile
+       sed -i "s:^INSTALLSITEMAN3DIR.*$:INSTALLSITEMAN3DIR = %{_mandir}/man3:" Makefile
+
+       %{__make}
+       cd ..
+%endif
+
 %if %{with kernel}
 cd lib/modules/source
 rm -rf built
 mkdir built
 
-%if %{without 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
                rm -rf $mod-only
                cp -a $mod-only.clean $mod-only
                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-%{_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
+               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} -j1 -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 \
-                       M=$PWD O=$PWD \
+                       SRCROOT=$PWD \
+                       M=$PWD O=$PWD/o \
                        VM_KBUILD=26 \
-                       %{?with_verbose:V=1}
+                       %{?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
-       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
@@ -409,17 +286,31 @@ rm -rf $RPM_BUILD_ROOT
 
 %if %{with userspace}
 install -d \
-       $RPM_BUILD_ROOT%{_sysconfdir}/vmware{,-console} \
+       $RPM_BUILD_ROOT%{_sysconfdir}/vmware{,-server-console} \
        $RPM_BUILD_ROOT%{_sysconfdir}/vmware/vmnet8/{nat,dhcpd} \
        $RPM_BUILD_ROOT%{_bindir} \
        $RPM_BUILD_ROOT%{_sbindir} \
-       $RPM_BUILD_ROOT%{_libdir}/vmware-{server,console}/bin \
-       $RPM_BUILD_ROOT%{_libdir}/vmware-console/bin \
+       $RPM_BUILD_ROOT%{_libdir}/vmware{,-server-console}/bin \
+       $RPM_BUILD_ROOT%{_libdir}/vmware/serverd \
        $RPM_BUILD_ROOT%{_mandir} \
        $RPM_BUILD_ROOT%{_pixmapsdir} \
        $RPM_BUILD_ROOT%{_desktopdir} \
        $RPM_BUILD_ROOT/etc/rc.d/init.d \
-       $RPM_BUILD_ROOT/var/run/vmware
+       $RPM_BUILD_ROOT/var/{log,run}/vmware
+
+       cd control-only
+       %{__make} install \
+               DESTDIR=$RPM_BUILD_ROOT
+       cd ..
+
+       # copy other required perl modules
+       cp -r lib/perl5/site_perl/5.005/VMware $RPM_BUILD_ROOT%{perl_vendorarch}
+       cp -r lib/perl5/site_perl/5.005/i386-linux/VMware/VmdbPerl $RPM_BUILD_ROOT%{perl_vendorarch}/VMware
+       cp -r lib/perl5/site_perl/5.005/i386-linux/VMware/{HConfig,VmdbPerl}.pm $RPM_BUILD_ROOT%{perl_vendorarch}/VMware
+       cp -r lib/perl5/site_perl/5.005/i386-linux/auto/VMware/{HConfig,VmdbPerl} $RPM_BUILD_ROOT%{perl_vendorarch}/auto/VMware
+
+       # remove unecessary files
+       rm -f $RPM_BUILD_ROOT%{perl_vendorarch}/auto/VMware/{HConfig,VmdbPerl,VmPerl}/.{exists,packlist}
 %endif
 
 %if %{with kernel}
@@ -428,31 +319,10 @@ install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/misc
 #cd vmware-any-any-update%{_urel}
 cd lib/modules/source
 
-%if %{without 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
@@ -470,45 +340,41 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/vmware/vmnet8/dhcpd/dhcpd.leases~
 
 install bin/*-* $RPM_BUILD_ROOT%{_bindir}
 install sbin/*-* $RPM_BUILD_ROOT%{_sbindir}
-install lib/bin/vmware-vmx $RPM_BUILD_ROOT%{_libdir}/vmware-server/bin
+install lib/bin/vmware-vmx $RPM_BUILD_ROOT%{_libdir}/vmware/bin
+
+sed -e ' s@%sitearch%@%{perl_sitearch}@g; s@%sitelib%@%{perl_sitelib}@g; s@%vendorarch%@%{perl_vendorarch}@g; s@%vendorlib%@%{perl_vendorlib}@g; s@%archlib%@%{perl_archlib}@g; s@%privlib%@%{perl_privlib}@g;' < lib/serverd/init.pl.default > $RPM_BUILD_ROOT%{_libdir}/vmware/serverd/init.pl
 
 #cp -r lib/{bin-debug,config,help*,isoimages,licenses,messages,smb,xkeymap} \
-cp -r  lib/{bin-debug,config,help*,isoimages,licenses,messages,xkeymap} \
-       $RPM_BUILD_ROOT%{_libdir}/vmware-server
+cp -r  lib/{bin-debug,config,help*,isoimages,licenses,messages,share,xkeymap} \
+       $RPM_BUILD_ROOT%{_libdir}/vmware
 
-cp -r  vmware-console-distrib/lib/{bin-debug,config,help*,messages,xkeymap} \
-       $RPM_BUILD_ROOT%{_libdir}/vmware-console
+cp -r  vmware-server-console-distrib/lib/{bin-debug,config,help*,messages,share,xkeymap} \
+       $RPM_BUILD_ROOT%{_libdir}/vmware-server-console
 
-install vmware-console-distrib/lib/bin/vmware-remotemks $RPM_BUILD_ROOT%{_libdir}/vmware-console/bin
+install vmware-server-console-distrib/lib/bin/vmware-remotemks $RPM_BUILD_ROOT%{_libdir}/vmware-server-console/bin
 
-cp -r  vmware-console-distrib/man/* man/* $RPM_BUILD_ROOT%{_mandir}
+cp -r  vmware-server-console-distrib/man/* man/* $RPM_BUILD_ROOT%{_mandir}
 gunzip $RPM_BUILD_ROOT%{_mandir}/man?/*.gz
 
-cat > $RPM_BUILD_ROOT%{_sysconfdir}/vmware/locations <<EOF
-VM_BINDIR=%{_bindir}
-VM_LIBDIR=%{_libdir}/vmware-server
-EOF
-
-cat > $RPM_BUILD_ROOT%{_sysconfdir}/vmware-console/locations <<EOF
+cat > $RPM_BUILD_ROOT%{_sysconfdir}/vmware-server-console/locations <<EOF
 VM_BINDIR=%{_bindir}
-VM_LIBDIR=%{_libdir}/vmware-console
+VM_LIBDIR=%{_libdir}/vmware-server-console
 EOF
 
 %if %{with internal_libs}
 install bin/vmware $RPM_BUILD_ROOT%{_bindir}
-install lib/bin/vmware $RPM_BUILD_ROOT%{_libdir}/vmware-server/bin
-cp -r  lib/lib $RPM_BUILD_ROOT%{_libdir}/vmware-server
+install lib/bin/vmware $RPM_BUILD_ROOT%{_libdir}/vmware/bin
+cp -r  lib/lib $RPM_BUILD_ROOT%{_libdir}/vmware
 
-install vmware-console-distrib/bin/vmware-console $RPM_BUILD_ROOT%{_bindir}
-install vmware-console-distrib/lib/bin/vmware $RPM_BUILD_ROOT%{_libdir}/vmware-console/bin
-cp -r  vmware-console-distrib/lib/lib $RPM_BUILD_ROOT%{_libdir}/vmware-console
+install vmware-server-console-distrib/bin/vmware-server-console $RPM_BUILD_ROOT%{_bindir}
+install vmware-server-console-distrib/lib/bin/vmware $RPM_BUILD_ROOT%{_libdir}/vmware-server-console/bin
+cp -r  vmware-server-console-distrib/lib/lib $RPM_BUILD_ROOT%{_libdir}/vmware-server-console
 %else
 install lib/bin/vmware $RPM_BUILD_ROOT%{_bindir}
-install vmware-console-distrib/lib/bin/vmware-console $RPM_BUILD_ROOT%{_bindir}
+install vmware-server-console-distrib/lib/bin/vmware-server-console $RPM_BUILD_ROOT%{_bindir}
 %endif
 %endif
 
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -534,48 +400,11 @@ 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)
 %doc doc/* lib/configurator/vmnet-{dhcpd,nat}.conf
 %dir %{_sysconfdir}/vmware
-%{_sysconfdir}/vmware/locations
 %attr(755,root,root) %{_bindir}/vm-support
 %attr(755,root,root) %{_bindir}/vmware-authtrusted
 %attr(755,root,root) %{_bindir}/vmware-cmd
@@ -584,61 +413,71 @@ fi
 %attr(755,root,root) %{_bindir}/vmware-mount.pl
 %attr(755,root,root) %{_bindir}/vmware-vdiskmanager
 %attr(755,root,root) %{_sbindir}/*
-%dir %{_libdir}/vmware-server
-%dir %{_libdir}/vmware-server/bin
+%dir %{_libdir}/vmware
+%dir %{_libdir}/vmware/bin
 # warning: SUID !!!
-%attr(4755,root,root) %{_libdir}/vmware-server/bin/vmware-vmx
-%{_libdir}/vmware-server/config
-%{_libdir}/vmware-server/isoimages
+%attr(4755,root,root) %{_libdir}/vmware/bin/vmware-vmx
+%{_libdir}/vmware/config
+%{_libdir}/vmware/isoimages
 %if %{with internal_libs}
-%attr(755,root,root) %{_libdir}/vmware-server/bin/vmware
-%{_libdir}/vmware-server/lib
-%attr(755,root,root) %{_libdir}/vmware-server/lib/wrapper-gtk24.sh
+%attr(755,root,root) %{_libdir}/vmware/bin/vmware
+%{_libdir}/vmware/lib
+%attr(755,root,root) %{_libdir}/vmware/lib/wrapper-gtk24.sh
 %endif
-%{_libdir}/vmware-server/licenses
-%dir %{_libdir}/vmware-server/messages
-%{_libdir}/vmware-server/messages/en
-%lang(ja) %{_libdir}/vmware-server/messages/ja
-%{_libdir}/vmware-server/xkeymap
+%dir %{_libdir}/vmware/serverd
+%attr(750,root,root) %{_libdir}/vmware/serverd/init.pl
+%{_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/vmware.1*
+%{_mandir}/man3/*
+%{perl_vendorarch}/VMware
+%{perl_vendorarch}/auto/VMware
 %attr(1777,root,root) %dir /var/run/vmware
+%attr(751,root,root) %dir /var/log/vmware
 %{_pixmapsdir}/*.png
 %{_desktopdir}/%{name}.desktop
 
 %files console
-%dir %{_sysconfdir}/vmware-console
-%{_sysconfdir}/vmware-console/locations
-%attr(755,root,root) %{_bindir}/vmware-console
-%dir %{_libdir}/vmware-console
-%dir %{_libdir}/vmware-console/bin
-%attr(755,root,root) %{_libdir}/vmware-console/bin/vmware-remotemks
-%{_libdir}/vmware-console/config
+%defattr(644,root,root,755)
+%dir %{_sysconfdir}/vmware-server-console
+%{_sysconfdir}/vmware-server-console/locations
+%attr(755,root,root) %{_bindir}/vmware-server-console
+%dir %{_libdir}/vmware-server-console
+%dir %{_libdir}/vmware-server-console/bin
+%attr(755,root,root) %{_libdir}/vmware-server-console/bin/vmware-remotemks
+%{_libdir}/vmware-server-console/config
 %if %{with internal_libs}
-%attr(755,root,root) %{_libdir}/vmware-console/bin/vmware
-%{_libdir}/vmware-console/lib
-%attr(755,root,root) %{_libdir}/vmware-console/lib/wrapper-gtk24.sh
+%attr(755,root,root) %{_libdir}/vmware-server-console/bin/vmware
+%{_libdir}/vmware-server-console/lib
+%attr(755,root,root) %{_libdir}/vmware-server-console/lib/wrapper-gtk24.sh
 %endif
-%dir %{_libdir}/vmware-console/messages
-%lang(ja) %{_libdir}/vmware-console/messages/ja
-%{_libdir}/vmware-console/xkeymap
-%{_mandir}/man1/vmware-console.1*
+%dir %{_libdir}/vmware-server-console/messages
+#%{_libdir}/vmware-server-console/messages/en
+%lang(ja) %{_libdir}/vmware-server-console/messages/ja
+%{_libdir}/vmware-server-console/share
+%{_libdir}/vmware-server-console/xkeymap
+%{_mandir}/man1/vmware-server-console.1*
 
 %files console-help
 %defattr(644,root,root,755)
-%{_libdir}/vmware-console/help*
+%{_libdir}/vmware-server-console/help*
 
 %files debug
 %defattr(644,root,root,755)
-%dir %{_libdir}/vmware-server/bin-debug
+%dir %{_libdir}/vmware/bin-debug
 # warning: SUID !!!
-%attr(4755,root,root) %{_libdir}/vmware-server/bin-debug/vmware-vmx
-%dir %{_libdir}/vmware-console/bin-debug
-%attr(755,root,root) %{_libdir}/vmware-server/bin-debug/vmware-remotemks
-%attr(755,root,root) %{_libdir}/vmware-console/bin-debug/vmware-remotemks
+%attr(4755,root,root) %{_libdir}/vmware/bin-debug/vmware-vmx
+%dir %{_libdir}/vmware-server-console/bin-debug
+%attr(755,root,root) %{_libdir}/vmware/bin-debug/vmware-remotemks
+%attr(755,root,root) %{_libdir}/vmware-server-console/bin-debug/vmware-remotemks
 
 %files help
 %defattr(644,root,root,755)
-%{_libdir}/vmware-server/help*
+%{_libdir}/vmware/help*
 
 %files networking
 %defattr(644,root,root,755)
@@ -668,7 +507,6 @@ fi
 %endif
 
 %if %{with kernel}
-%if %{without kernel24}
 %files -n kernel-misc-vmmon
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/misc/vmmon.ko*
@@ -676,36 +514,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
This page took 0.849504 seconds and 4 git commands to generate.