SPECS: VMware-server.spec - blah, reverted some s/vmware/vmware-se...

hawk hawk at pld-linux.org
Mon Jun 19 17:50:52 CEST 2006 

Author: hawk                         Date: Mon Jun 19 15:50:52 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- blah, reverted some s/vmware/vmware-server/, now at least console works
- added required /var/log/vmware, serverd still doesn't work

---- Files affected:
SPECS:
   VMware-server.spec (1.12 -> 1.13) 

---- Diffs:

================================================================
Index: SPECS/VMware-server.spec
diff -u SPECS/VMware-server.spec:1.12 SPECS/VMware-server.spec:1.13
--- SPECS/VMware-server.spec:1.12	Sun Jun 18 15:51:41 2006
+++ SPECS/VMware-server.spec	Mon Jun 19 17:50:46 2006
@@ -447,12 +447,12 @@
 	$RPM_BUILD_ROOT%{_sysconfdir}/vmware/vmnet8/{nat,dhcpd} \
 	$RPM_BUILD_ROOT%{_bindir} \
 	$RPM_BUILD_ROOT%{_sbindir} \
-	$RPM_BUILD_ROOT%{_libdir}/vmware-{server,server-console}/bin \
+	$RPM_BUILD_ROOT%{_libdir}/vmware{,-server-console}/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/run/vmware
+	$RPM_BUILD_ROOT/var/{log,run}/vmware
 
 	cd control-only
 	%{__make} install \
@@ -508,13 +508,13 @@
 
 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
 
 #cp -r	lib/{bin-debug,config,help*,isoimages,licenses,messages,smb,xkeymap} \
-cp -r	lib/{bin-debug,config,help*,isoimages,licenses,messages,xkeymap,share} \
-	$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-server-console-distrib/lib/{bin-debug,config,help*,messages,xkeymap,share} \
+cp -r	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
@@ -522,11 +522,6 @@
 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-server-console/locations <<EOF
 VM_BINDIR=%{_bindir}
 VM_LIBDIR=%{_libdir}/vmware-server-console
@@ -534,8 +529,8 @@
 
 %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-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
@@ -612,7 +607,6 @@
 %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
@@ -621,28 +615,29 @@
 %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
-%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/share
-%{_libdir}/vmware-server/xkeymap
+%attr(755,root,root) %{_libdir}/vmware/bin/vmware
+%{_libdir}/vmware/lib
+%attr(755,root,root) %{_libdir}/vmware/lib/wrapper-gtk24.sh
+%endif
+%{_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
 
@@ -673,16 +668,16 @@
 
 %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
+%attr(4755,root,root) %{_libdir}/vmware/bin-debug/vmware-vmx
 %dir %{_libdir}/vmware-server-console/bin-debug
-%attr(755,root,root) %{_libdir}/vmware-server/bin-debug/vmware-remotemks
+%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)
@@ -760,6 +755,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.13  2006/06/19 15:50:46  hawk
+- blah, reverted some s/vmware/vmware-server/, now at least console works
+- added required /var/log/vmware, serverd still doesn't work
+
 Revision 1.12  2006/06/18 13:51:41  hawk
 - s/vmware-console/vmware-server-console/ where needed,
   now it builds, not tested
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/VMware-server.spec?r1=1.12&r2=1.13&f=u

More information about the pld-cvs-commit mailing list