From 4e42adb1f86086e63dd287b4f93c23130bda30bd Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Thu, 6 Mar 2008 15:51:15 +0000 Subject: [PATCH] - try userspace packaging Changed files: VMware-server.spec -> 1.37 --- VMware-server.spec | 97 +++++++++++++++++++++++++++++----------------- 1 file changed, 62 insertions(+), 35 deletions(-) diff --git a/VMware-server.spec b/VMware-server.spec index 26556b1..5185bba 100644 --- a/VMware-server.spec +++ b/VMware-server.spec @@ -20,16 +20,17 @@ # # Conditional build: %bcond_without dist_kernel # without distribution kernel -%bcond_without kernel # don't build kernel modules +%bcond_with kernel # don't build kernel modules %bcond_without userspace # don't build userspace utilities %bcond_with internal_libs # internal libs stuff +%bcond_with doc # package huge docs %bcond_with verbose # verbose build (V=1) # %include /usr/lib/rpm/macros.perl # %define ver 2.0 %define subver 63231 -%define rel 0.1 +%define rel 0.2 %define urel 115 %define ccver %(rpm -q --qf %{V} gcc) # @@ -71,9 +72,9 @@ BuildRequires: libstdc++-devel BuildRequires: rpm-perlprov BuildRequires: rpmbuild(macros) >= 1.438 BuildRequires: sed >= 4.0 -Requires: libgnomecanvasmm -Requires: libsexy -Requires: libsexymm +#Requires: libgnomecanvasmm +#Requires: libsexy +#Requires: libsexymm ExclusiveArch: %{ix86} %{x8664} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -332,11 +333,14 @@ install -d \ $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 -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 @@ -346,6 +350,7 @@ install -d \ # 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 @@ -368,12 +373,20 @@ install bin/*-* $RPM_BUILD_ROOT%{_bindir} install sbin/*-* $RPM_BUILD_ROOT%{_sbindir} 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 +%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 -r lib/{bin-debug,config,help*,isoimages,licenses,messages,smb,xkeymap} \ -cp -r lib/{bin-debug,config,help*,isoimages,licenses,messages,share,xkeymap} \ +cp -r lib/{config,help,isoimages,licenses,messages,share,xkeymap} \ $RPM_BUILD_ROOT%{_libdir}/vmware +%if 0 cp -r vmware-server-console-distrib/lib/{bin-debug,config,help*,messages,share,xkeymap} \ $RPM_BUILD_ROOT%{_libdir}/vmware-server-console @@ -381,6 +394,7 @@ install vmware-server-console-distrib/lib/bin/vmware-remotemks $RPM_BUILD_ROOT%{ cp -r 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 <