X-Git-Url: http://git.pld-linux.org/?p=packages%2FVMware-server.git;a=blobdiff_plain;f=VMware-server.spec;h=1cb8893025a6cdc9d8f44ac0d8a9821f7ac7af9d;hp=f96a00b68a0c6f090cff105c61dde6e906c02f69;hb=73ea1463b769b14c065fe71ce3aa4a7895a3a138;hpb=2e68f0695c944b8dcff66a229be84f122f95714b diff --git a/VMware-server.spec b/VMware-server.spec index f96a00b..1cb8893 100644 --- a/VMware-server.spec +++ b/VMware-server.spec @@ -29,25 +29,25 @@ %define _kernelsrcdir /usr/src/linux-2.4 %endif # -%define _ver e.x.p -%define _build 22874 -%define _rel 0.2 -%define _urel 101 +%define _ver 1.0.0 +%define _build 28343 +%define _rel 0.1 +%define _urel 104 %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: 3ef78e4deb44e51e99043e008c5a0e90 +# NoSource0-md5: a25b4beb53785c05ef3b3077d87f6e2b Source1: http://download3.vmware.com/software/vmserver/VMware-mui-%{_ver}-%{_build}.tar.gz -# NoSource1-md5: 4666688c7f1782022b55618f3cd620e8 +# NoSource1-md5: 0de45c02fcaa30ac41517b687f34b29b Source2: http://knihovny.cvut.cz/ftp/pub/vmware/vmware-any-any-update%{_urel}.tar.gz -# NoSource2-md5: b3ce457f5b9ae8b606fd70f56084877d +# NoSource2-md5: 8cba16d3f6b3723b43d555a5f7cbf850 Source3: %{name}.init Source4: %{name}-vmnet.conf Source5: %{name}.png @@ -56,14 +56,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 >= 3:2.6.7} BuildRequires: rpm-perlprov BuildRequires: rpmbuild(macros) >= 1.268 BuildRequires: sed >= 4.0 -Requires: kernel(vmmon) = %{version}-%{_rel} Requires: libgnomecanvasmm ExclusiveArch: %{ix86} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -76,39 +78,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 wydajno¶ci. +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 @@ -116,12 +118,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 @@ -129,39 +131,38 @@ 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 @@ -175,12 +176,12 @@ 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 @@ -194,12 +195,12 @@ 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. +%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): Modu³ j±dra SMP dla 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 @@ -213,12 +214,12 @@ 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. +%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): Modu³ j±dra SMP dla 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 @@ -232,12 +233,12 @@ 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. +%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): 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 @@ -251,12 +252,12 @@ 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. +%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): 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 @@ -270,12 +271,12 @@ 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. +%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): Modu³ j±dra SMP dla 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 @@ -289,12 +290,12 @@ 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. +%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): Modu³ j±dra SMP dla 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 @@ -308,12 +309,12 @@ 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 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/VMware-console-%{_ver}-%{_build}.tar.gz +tar zxf vmware-mui-distrib/console-distrib/%{name}-console-%{_ver}-%{_build}.tar.gz #cd vmware-any-any-update%{_urel} cd lib/modules/source tar xf vmmon.tar @@ -323,6 +324,8 @@ 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 @@ -339,12 +342,24 @@ 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} +%if !%{with 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 @@ -367,7 +382,7 @@ for mod in vmmon vmnet ; do -i ../vmnet-only/driver.c fi %if %{with dist_kernel} - %{__make} -C %{_kernelsrcdir} O=$PWD/o prepare scripts + %{__make} -j1 -C %{_kernelsrcdir} O=$PWD/o prepare scripts %else install -d o/include/config touch o/include/config/MARKER @@ -427,17 +442,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} @@ -446,7 +475,7 @@ install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/misc #cd vmware-any-any-update%{_urel} cd lib/modules/source -%if %{without kernel24} +%if !%{with 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 \ @@ -488,41 +517,38 @@ 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,share} \ - $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 < $RPM_BUILD_ROOT%{_sysconfdir}/vmware-console/locations < $RPM_BUILD_ROOT%{_sysconfdir}/vmware-server-console/locations <