SPECS: VMware-server.spec - separate iso images, cleanup 1.0 junk
glen
glen at pld-linux.org
Mon Apr 7 21:34:28 CEST 2008
Author: glen Date: Mon Apr 7 19:34:28 2008 GMT
Module: SPECS Tag: HEAD
---- Log message:
- separate iso images, cleanup 1.0 junk
---- Files affected:
SPECS:
VMware-server.spec (1.47 -> 1.48)
---- Diffs:
================================================================
Index: SPECS/VMware-server.spec
diff -u SPECS/VMware-server.spec:1.47 SPECS/VMware-server.spec:1.48
--- SPECS/VMware-server.spec:1.47 Mon Apr 7 17:55:59 2008
+++ SPECS/VMware-server.spec Mon Apr 7 21:34:23 2008
@@ -6,25 +6,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
@@ -38,8 +20,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
@@ -58,8 +39,6 @@
# 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
@@ -68,23 +47,20 @@
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
@@ -262,7 +238,6 @@
%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}
@@ -271,9 +246,11 @@
%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
@@ -288,51 +265,9 @@
%{__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
@@ -362,53 +297,31 @@
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}
@@ -427,8 +340,6 @@
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
@@ -456,12 +367,7 @@
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
@@ -469,52 +375,15 @@
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 <<EOF
-VM_BINDIR=%{_bindir}
-VM_LIBDIR=%{_libdir}/vmware-server-console
-EOF
-
%if %{with internal_libs}
install bin/vmware $RPM_BUILD_ROOT%{_bindir}
install lib/bin/* $RPM_BUILD_ROOT%{_libdir}/vmware/bin
-#install lib/bin/vmware $RPM_BUILD_ROOT%{_libdir}/vmware/bin
cp -a lib/lib $RPM_BUILD_ROOT%{_libdir}/vmware
-
-%if 0
-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 -a vmware-server-console-distrib/lib/lib $RPM_BUILD_ROOT%{_libdir}/vmware-server-console
%endif
-%else
-%if 0
-install lib/bin/vmware $RPM_BUILD_ROOT%{_bindir}
-install vmware-server-console-distrib/lib/bin/vmware-server-console $RPM_BUILD_ROOT%{_bindir}
-%endif
-%endif
%endif
%clean
@@ -557,7 +426,6 @@
%if %{with userspace}
%files
%defattr(444,root,root,755)
-#%doc lib/configurator/vmnet-{dhcpd,nat}.conf
%dir %{_sysconfdir}/vmware
%dir %{_sysconfdir}/vmware/state
%dir %{_sysconfdir}/vmware/hostd
@@ -573,20 +441,25 @@
%attr(555,root,root) %{_sysconfdir}/vmware/installer.sh
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/vmware/locations
+# TODO: vmnet
+%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*
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/vmware/vmnet.conf
+%attr(754,root,root) /etc/rc.d/init.d/vmnet
+# TODO: vmnet
+
%attr(754,root,root) /etc/rc.d/init.d/vmware
%attr(754,root,root) /etc/rc.d/init.d/vmware-autostart
%attr(754,root,root) /etc/rc.d/init.d/vmware-core
%attr(754,root,root) /etc/rc.d/init.d/vmware-mgmt
%attr(555,root,root) %{_bindir}/vm-support
-#%attr(755,root,root) %{_bindir}/vmware-authtrusted
-#%attr(755,root,root) %{_bindir}/vmware-cmd
-#%attr(755,root,root) %{_bindir}/vmware-loop
-#%attr(755,root,root) %{_bindir}/vmware-mount.pl
%attr(555,root,root) %{_bindir}/vmware-config.pl
%attr(555,root,root) %{_bindir}/vmware-mount
-#%attr(555,root,root) %{_bindir}/vmware-uninstall.pl
-#%attr(555,root,root) %{_bindir}/vmware-vimdump
%attr(555,root,root) %{_bindir}/vmware-vimsh
%attr(555,root,root) %{_bindir}/vmware-vsh
%attr(555,root,root) %{_bindir}/vmware-watchdog
@@ -599,12 +472,10 @@
# warning: SUID !!!
%attr(555,root,root) %{_libdir}/vmware/bin/vmware-vmx
%{_libdir}/vmware/config
-%{_libdir}/vmware/isoimages
%if %{with internal_libs}
%attr(555,root,root) %{_bindir}/vmware
# - XXX -networking
%attr(4555,root,root) %{_bindir}/vmware-ping
-#%attr(755,root,root) %{_libdir}/vmware/bin/vmware
%attr(555,root,root) %{_libdir}/vmware/bin/openssl
%attr(555,root,root) %{_libdir}/vmware/bin/vmrun
%attr(755,root,root) %{_libdir}/vmware/bin/vmware-hostd
@@ -640,11 +511,8 @@
%attr(555,root,root) %{_libdir}/vmware/lib/wrapper-gtk24.sh
%endif
-#%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
@@ -669,9 +537,6 @@
%attr(755,root,root) %{_libdir}/vmware/hostd/py
%attr(755,root,root) %{_libdir}/vmware/hostd/wsdl
%{_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
@@ -787,7 +652,6 @@
%{_libdir}/vmware/net-services.sh
%defattr(444,root,root,755)
-%{_libdir}/vmware/modules
%{_libdir}/vmware/configurator
# -networking stuff
@@ -797,45 +661,23 @@
%attr(555,root,root) %{_bindir}/vmnet-netifup
%attr(555,root,root) %{_bindir}/vmnet-sniffer
+%if 0
%files console
%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-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-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-server-console/help*
%files debug
%defattr(644,root,root,755)
-#%dir %{_libdir}/vmware/bin-debug
-# warning: SUID !!!
-#%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
-%if 0
%files help
%defattr(644,root,root,755)
%{_libdir}/vmware/help
-%endif
%files networking
%defattr(644,root,root,755)
@@ -847,14 +689,7 @@
%attr(755,root,root) %{_bindir}/vmnet-netifup
%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*
-%if 0
%files samba
%defattr(644,root,root,755)
%doc lib/configurator/vmnet-smb.conf
@@ -890,6 +725,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.48 2008-04-07 19:34:23 glen
+- separate iso images, cleanup 1.0 junk
+
Revision 1.47 2008-04-07 15:55:59 glen
- update to beta2 (build 84186)
- new module: vsock (depends on vmci)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/VMware-server.spec?r1=1.47&r2=1.48&f=u
More information about the pld-cvs-commit
mailing list