From e73739c33698098118238cad8bf3d36be2f750bf Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Mon, 7 Apr 2008 19:34:23 +0000 Subject: [PATCH] - separate iso images, cleanup 1.0 junk Changed files: VMware-server.spec -> 1.48 --- VMware-server.spec | 233 +++++++-------------------------------------- 1 file changed, 34 insertions(+), 199 deletions(-) diff --git a/VMware-server.spec b/VMware-server.spec index d8f8e4c..219e235 100644 --- a/VMware-server.spec +++ b/VMware-server.spec @@ -5,25 +5,7 @@ # - make use rc-inetd style config # - switch to proper %{_libdir} when done for 64bit arch # - sane permissions -# -# This doesn't work at all yet. I don't know if the management interface is needed -# (bundling apache seems like a sooooooooo great idea). Maybe it is possible to -# setup the server part by hand. The perl module in perl/control.tar needs to -# be packaged (vmware-cmd requires that). Something needs to be done with -# the authd (inetd integration is needed I guess). -# -# The modules from any-any upgrade are too old (I used the ones comming with VMw-S). -# -# It builds on amd64, I have changed the networking package not to require the main package -# so it can be installed outside 32bit chroot. -# -# 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 +# - package webAccess elsewhere, seems noarch mostly (but if using system pkgs for java/tomcat leave it still huge) # # Conditional build: %bcond_without dist_kernel # without distribution kernel @@ -37,8 +19,7 @@ # %define ver 2.0 %define subver 84186 -%define rel 0.1 -%define urel 116 +%define rel 0.3 %{expand:%%global ccver %(%{__cc} -dumpversion)} # Summary: VMware Server @@ -57,8 +38,6 @@ Source2: http://download3.vmware.com/software/vmserver/VMware-vix-e.x.p-%{subver # NoSource2-md5: d81db3079785a7454902aed222e611ad Source3: http://download3.vmware.com/software/vmserver/VMware-vix-e.x.p-%{subver}.x86_64.tar.gz # NoSource3-md5: bc7bdf81d14887861b4f5413e78fd539 -Source4: http://uruz.org/files/vmware-any-any-update-%{urel}.tgz -# NoSource4-md5: 3a2e2cb8c3d662190198c77c4a656dbb Source5: %{name}.init Source6: %{name}-vmnet.conf Source7: %{name}.png @@ -67,23 +46,20 @@ Source9: %{name}-nat.conf Source10: %{name}-dhcpd.conf Source11: %{name}-libs Source12: %{name}-authd.rc-inetd -Patch0: %{name}-Makefile.patch -Patch1: %{name}-run_script.patch -Patch2: %{name}-init_pl.patch -Patch3: %{name}-config-rc-inetd.patch -Patch4: %{name}-config-kernel.patch -Patch5: %{name}-initscript.patch +Patch0: %{name}-config-rc-inetd.patch +Patch1: %{name}-config-kernel.patch +Patch2: %{name}-initscript.patch NoSource: 0 NoSource: 1 NoSource: 2 NoSource: 3 -NoSource: 4 URL: http://www.vmware.com/ %{?with_dist_kernel:BuildRequires: kernel%{_alt_kernel}-module-build >= 3:2.6.16} BuildRequires: libstdc++-devel BuildRequires: rpm-perlprov BuildRequires: rpmbuild(macros) >= 1.449 BuildRequires: sed >= 4.0 +Requires: %{name}-isoimages = %{version} #Requires: libgnomecanvasmm #Requires: libsexy #Requires: libsexymm @@ -261,7 +237,6 @@ Kernel modules for VMware Server - vsock. %description -n kernel%{_alt_kernel}-misc-vsock -l pl.UTF-8 Moduły jądra dla VMware Server - vsock. - %prep %ifarch %{ix86} %setup -q -T -n vmware-server-distrib -b0 %{?with_userspace:-a2} @@ -270,9 +245,11 @@ Moduły jądra dla VMware Server - vsock. %setup -q -T -n vmware-server-distrib -b1 %{?with_userspace:-a3} %endif -%patch3 -p1 -#%patch4 -p1 -#%patch5 -p1 +rm -rf lib/isoimages # packaged by %{name}-isoimages.spec + +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 cd lib/modules %{__tar} xf source/vmci.tar @@ -287,51 +264,9 @@ cd - %{__gzip} -d man/man1/vmware.1.gz -%if 0 -tar zxf vmware-mui-distrib/console-distrib/%{name}-console-%{ver}-%{subver}.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 -cp -a vmmon-only{,.clean} -cp -a vmnet-only{,.clean} -cd - -%patch1 -p1 -%patch2 -p0 -tar xf lib/perl/control.tar -%endif +find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f %build - -%if 0 -cd vmware-any-any-update%{urel} -chmod u+w ../lib/bin/vmware-vmx ../lib/bin-debug/vmware-vmx ../bin/vmnet-bridge -%endif - -%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 -cd - -%endif - -%if %{with userspace} -%if 0 - 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 -%endif - %if %{with kernel} cd lib/modules @@ -361,53 +296,31 @@ EOF cp -a vmci-only/Module.symvers vsock-only %build_kernel_modules -C vsock-only -m vsock SRCROOT=$PWD VM_KBUILD=26 VM_CCVER=%{ccver} -c - %endif %install rm -rf $RPM_BUILD_ROOT +%if %{with kernel} +%install_kernel_modules -m lib/modules/vmci-only/vmci -d misc +%install_kernel_modules -m lib/modules/vmmon-only/vmmon -d misc +%install_kernel_modules -m lib/modules/vmnet-only/vmnet -d misc +%install_kernel_modules -m lib/modules/vsock-only/vsock -d misc +%endif %if %{with userspace} install -d \ - $RPM_BUILD_ROOT%{_sysconfdir}/vmware{,-server-console} \ $RPM_BUILD_ROOT%{_sysconfdir}/vmware/vmnet8/{nat,dhcpd} \ $RPM_BUILD_ROOT%{_sysconfdir}/vmware/state \ $RPM_BUILD_ROOT%{_bindir} \ $RPM_BUILD_ROOT%{_sbindir} \ - $RPM_BUILD_ROOT%{_libdir}/vmware{,-server-console}/bin \ + $RPM_BUILD_ROOT%{_libdir}/vmware/bin \ $RPM_BUILD_ROOT%{_mandir} \ $RPM_BUILD_ROOT%{_pixmapsdir} \ $RPM_BUILD_ROOT%{_desktopdir} \ $RPM_BUILD_ROOT/etc/rc.d/init.d \ - $RPM_BUILD_ROOT/var/{log,run}/vmware - -%if 0 - cd control-only - %{__make} install \ - DESTDIR=$RPM_BUILD_ROOT - cd .. -%endif - -%if 0 - # copy other required perl modules - cp -a lib/perl5/site_perl/5.005/VMware $RPM_BUILD_ROOT%{perl_vendorarch} - cp -a lib/perl5/site_perl/5.005/i386-linux/VMware/VmdbPerl $RPM_BUILD_ROOT%{perl_vendorarch}/VMware - cp -a lib/perl5/site_perl/5.005/i386-linux/VMware/{HConfig,VmdbPerl}.pm $RPM_BUILD_ROOT%{perl_vendorarch}/VMware - cp -a 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 -%endif - -%if %{with kernel} -%install_kernel_modules -m lib/modules/vmci-only/vmci -d misc -%install_kernel_modules -m lib/modules/vmmon-only/vmmon -d misc -%install_kernel_modules -m lib/modules/vmnet-only/vmnet -d misc -%install_kernel_modules -m lib/modules/vsock-only/vsock -d misc -%endif + $RPM_BUILD_ROOT/var/{log,run}/vmware \ + $RPM_BUILD_ROOT/var/lib/vmware/{hostd,"Virtual Machines"} -%if %{with userspace} install %{SOURCE5} $RPM_BUILD_ROOT/etc/rc.d/init.d/vmnet install %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/vmware/vmnet.conf install %{SOURCE7} $RPM_BUILD_ROOT%{_pixmapsdir} @@ -426,8 +339,6 @@ cp -a lib/hostd $RPM_BUILD_ROOT%{_libdir}/vmware cp -a vmware-vix $RPM_BUILD_ROOT%{_libdir}/vmware cp -a lib/vmacore $RPM_BUILD_ROOT%{_libdir}/vmware cp -a lib/net-services.sh $RPM_BUILD_ROOT%{_libdir}/vmware -cp -a lib/modules $RPM_BUILD_ROOT%{_libdir}/vmware -rm -rf $RPM_BUILD_ROOT%{_libdir}/vmware/modules/*-only cp -a lib/configurator $RPM_BUILD_ROOT%{_libdir}/vmware cp -a %{SOURCE12} $RPM_BUILD_ROOT%{_libdir}/vmware/configurator/authd-rc-inetd.conf cp -a etc/hostd $RPM_BUILD_ROOT/etc/vmware/hostd @@ -455,12 +366,7 @@ answer DOCDIR /usr/share/doc/vmware answer MANDIR /usr/share/man answer INITDIR /etc/rc.d answer INITSCRIPTSDIR /etc/rc.d/init.d -file /etc/vmware/not_configured 1205422799 -file /etc/rc.d/init.d/vmware 1205422799 answer INSTALL_CYCLE yes -file /etc/rc.d/init.d/vmware-mgmt -file /etc/rc.d/init.d/vmware-core -file /etc/rc.d/init.d/vmware-autostart EOF rm $RPM_BUILD_ROOT/usr/bin/vmware-uninstall.pl @@ -468,52 +374,15 @@ rm $RPM_BUILD_ROOT/usr/bin/vmware-vimdump rm $RPM_BUILD_ROOT/usr/share/applications/VMware-server.desktop rm $RPM_BUILD_ROOT/usr/share/pixmaps/VMware-server.png -%if 0 -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 -%endif - -cp -a lib/{config,help,isoimages,licenses,messages,share,xkeymap} \ +cp -a lib/{config,help,licenses,messages,share,xkeymap} \ $RPM_BUILD_ROOT%{_libdir}/vmware -%if 0 -cp -a vmware-server-console-distrib/lib/{bin-debug,config,help*,messages,share,xkeymap} \ - $RPM_BUILD_ROOT%{_libdir}/vmware-server-console - -install vmware-server-console-distrib/lib/bin/vmware-remotemks $RPM_BUILD_ROOT%{_libdir}/vmware-server-console/bin - -cp -a vmware-server-console-distrib/man/* man/* $RPM_BUILD_ROOT%{_mandir} -gunzip $RPM_BUILD_ROOT%{_mandir}/man?/*.gz -%endif - -cat > $RPM_BUILD_ROOT%{_sysconfdir}/vmware-server-console/locations <