SPECS: VMware-server.spec - s/vmware-console/vmware-server-console...

[hawk]

Author: hawk                         Date: Sun Jun 18 13:51:46 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- s/vmware-console/vmware-server-console/ where needed,
  now it builds, not tested

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

---- Diffs:

================================================================
Index: SPECS/VMware-server.spec
diff -u SPECS/VMware-server.spec:1.11 SPECS/VMware-server.spec:1.12
--- SPECS/VMware-server.spec:1.11	Sun Jun 18 14:12:40 2006
+++ SPECS/VMware-server.spec	Sun Jun 18 15:51:41 2006
@@ -443,12 +443,11 @@
 
 %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,server-console}/bin \
 	$RPM_BUILD_ROOT%{_mandir} \
 	$RPM_BUILD_ROOT%{_pixmapsdir} \
 	$RPM_BUILD_ROOT%{_desktopdir} \
@@ -515,12 +514,12 @@
 cp -r	lib/{bin-debug,config,help*,isoimages,licenses,messages,xkeymap,share} \
 	$RPM_BUILD_ROOT%{_libdir}/vmware-server
 
-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,xkeymap,share} \
+	$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 <<EOF
@@ -528,9 +527,9 @@
 VM_LIBDIR=%{_libdir}/vmware-server
 EOF
 
-cat > $RPM_BUILD_ROOT%{_sysconfdir}/vmware-console/locations <<EOF
+cat > $RPM_BUILD_ROOT%{_sysconfdir}/vmware-server-console/locations <<EOF
 VM_BINDIR=%{_bindir}
-VM_LIBDIR=%{_libdir}/vmware-console
+VM_LIBDIR=%{_libdir}/vmware-server-console
 EOF
 
 %if %{with internal_libs}
@@ -538,12 +537,12 @@
 install lib/bin/vmware $RPM_BUILD_ROOT%{_libdir}/vmware-server/bin
 cp -r	lib/lib $RPM_BUILD_ROOT%{_libdir}/vmware-server
 
-install vmware-console-distrib/bin/vmware-console $RPM_BUILD_ROOT%{_bindir}
-install vmware-console-distrib/lib/bin/vmware $RPM_BUILD_ROOT%{_libdir}/vmware-console/bin
-cp -r	vmware-console-distrib/lib/lib $RPM_BUILD_ROOT%{_libdir}/vmware-console
+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 -r	vmware-server-console-distrib/lib/lib $RPM_BUILD_ROOT%{_libdir}/vmware-server-console
 %else
 install lib/bin/vmware $RPM_BUILD_ROOT%{_bindir}
-install vmware-console-distrib/lib/bin/vmware-console $RPM_BUILD_ROOT%{_bindir}
+install vmware-server-console-distrib/lib/bin/vmware-server-console $RPM_BUILD_ROOT%{_bindir}
 %endif
 %endif
 
@@ -649,37 +648,37 @@
 
 %files console
 %defattr(644,root,root,755)
-%dir %{_sysconfdir}/vmware-console
-%{_sysconfdir}/vmware-console/locations
-%attr(755,root,root) %{_bindir}/vmware-console
-%dir %{_libdir}/vmware-console
-%dir %{_libdir}/vmware-console/bin
-%attr(755,root,root) %{_libdir}/vmware-console/bin/vmware-remotemks
-%{_libdir}/vmware-console/config
+%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-console/bin/vmware
-%{_libdir}/vmware-console/lib
-%attr(755,root,root) %{_libdir}/vmware-console/lib/wrapper-gtk24.sh
-%endif
-%dir %{_libdir}/vmware-console/messages
-#%{_libdir}/vmware-console/messages/en
-%lang(ja) %{_libdir}/vmware-console/messages/ja
-%{_libdir}/vmware-console/share
-%{_libdir}/vmware-console/xkeymap
-%{_mandir}/man1/vmware-console.1*
+%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-console/help*
+%{_libdir}/vmware-server-console/help*
 
 %files debug
 %defattr(644,root,root,755)
 %dir %{_libdir}/vmware-server/bin-debug
 # warning: SUID !!!
 %attr(4755,root,root) %{_libdir}/vmware-server/bin-debug/vmware-vmx
-%dir %{_libdir}/vmware-console/bin-debug
+%dir %{_libdir}/vmware-server-console/bin-debug
 %attr(755,root,root) %{_libdir}/vmware-server/bin-debug/vmware-remotemks
-%attr(755,root,root) %{_libdir}/vmware-console/bin-debug/vmware-remotemks
+%attr(755,root,root) %{_libdir}/vmware-server-console/bin-debug/vmware-remotemks
 
 %files help
 %defattr(644,root,root,755)
@@ -761,6 +760,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.12  2006/06/18 13:51:41  hawk
+- s/vmware-console/vmware-server-console/ where needed,
+  now it builds, not tested
+
 Revision 1.11  2006/06/18 12:12:40  hawk
 - tarball name has changed
 
================================================================

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