- noreplace locations!

[packages/VMware-server.git] / VMware-server.spec

diff --git a/VMware-server.spec b/VMware-server.spec
index f049836432528329e2c9fc673490411c4da23e24..59e9a4ca6a1927d83248d6ac66facf26c5e15f18 100644 (file)
--- a/VMware-server.spec
+++ b/VMware-server.spec
@@ -31,8 +31,8 @@
 %define                ver     2.0
 %define                subver  63231
 %define                rel     0.5
-%define                urel    115
-%{expand:%%define      ccver   %(%{__cc} -dumpversion)}
+%define                urel    116
+%{expand:%%global      ccver   %(%{__cc} -dumpversion)}
 #
 Summary:       VMware Server
 Summary(pl.UTF-8):     VMware Server - wirtualna platforma dla stacji roboczej
@@ -50,8 +50,8 @@ Source2:      http://download3.vmware.com/software/vmserver/VMware-vix-e.x.p-%{subver
 # NoSource2-md5:       c7d162fb8c805143ea5b40e7f62ef4da
 Source3:       http://download3.vmware.com/software/vmserver/VMware-vix-e.x.p-%{subver}.x86_64.tar.gz
 # NoSource3-md5:       10124d4747e7a579a270376458b7a77b
-Source4:       http://knihovny.cvut.cz/ftp/pub/vmware/vmware-any-any-update%{urel}.tar.gz
-# NoSource4-md5:       ab33ff7a799fee77f0f4ba5667cd4b9a
+Source4:       http://uruz.org/files/vmware-any-any-update-%{urel}.tgz
+# NoSource4-md5:       3a2e2cb8c3d662190198c77c4a656dbb
 Source5:       %{name}.init
 Source6:       %{name}-vmnet.conf
 Source7:       %{name}.png
@@ -59,9 +59,13 @@ Source8:     %{name}.desktop
 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
 NoSource:      0
 NoSource:      1
 NoSource:      2
@@ -242,6 +246,10 @@ Moduły jądra dla VMware Server - vmnet.
 %setup -q -T -n vmware-server-distrib -b1 %{?with_userspace:-a3}
 %endif
 
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+
 cd lib/modules
 %{__tar} xf source/vmci.tar
 %{__tar} xf source/vmmon.tar
@@ -391,6 +399,7 @@ 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
 cp -a etc/installer.sh $RPM_BUILD_ROOT/etc/vmware
 cp -a etc/pam.d $RPM_BUILD_ROOT/etc/vmware
@@ -525,7 +534,7 @@ fi
 %dir %{_sysconfdir}/vmware/service
 %attr(644,root,root) %{_sysconfdir}/vmware/service/services.xml
 %attr(555,root,root) %{_sysconfdir}/vmware/installer.sh
-%{_sysconfdir}/vmware/locations
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/vmware/locations
 
 %attr(754,root,root) /etc/rc.d/init.d/vmware
 %attr(754,root,root) /etc/rc.d/init.d/vmware-autostart
@@ -704,7 +713,12 @@ fi
 %attr(555,root,root) %{_libdir}/vmware/webAccess/java/jre1.5.0_07/bin/*
 %dir %{_libdir}/vmware/webAccess/java/jre1.5.0_07/bin
 %dir %{_libdir}/vmware/webAccess/java/jre1.5.0_07/lib
+%ifarch %{ix86}
+%dir %{_libdir}/vmware/webAccess/java/jre1.5.0_07/lib/i386
+%endif
+%ifarch %{x8664}
 %dir %{_libdir}/vmware/webAccess/java/jre1.5.0_07/lib/amd64
+%endif
 %attr(555,root,root) %{_libdir}/vmware/webAccess/java/jre1.5.0_07/lib/*/*.so
 %attr(555,root,root) %{_libdir}/vmware/webAccess/java/jre1.5.0_07/lib/*/headless/*.so
 %attr(555,root,root) %{_libdir}/vmware/webAccess/java/jre1.5.0_07/lib/*/motif21/*.so
@@ -726,11 +740,30 @@ fi
 %{_libdir}/vmware/webAccess/java/jre1.5.0_07/lib/oblique-fonts
 %{_libdir}/vmware/webAccess/java/jre1.5.0_07/lib/psfont*
 %{_libdir}/vmware/webAccess/java/jre1.5.0_07/[A-Z]*
-%{_libdir}/vmware/webAccess/java/jre1.5.0_07/.systemPrefs
 %attr(644,root,root) %{_libdir}/vmware/webAccess/vmware*
+%ifarch %{ix86}
+%attr(555,root,root) %{_libdir}/vmware/webAccess/java/jre1.5.0_07/lib/i386/awt_robot
+%attr(555,root,root) %{_libdir}/vmware/webAccess/java/jre1.5.0_07/lib/i386/gtkhelper
+%{_libdir}/vmware/webAccess/java/jre1.5.0_07/lib/i386/jvm.cfg
+%{_libdir}/vmware/webAccess/java/jre1.5.0_07/lib/i386/server/Xusage.txt
+%dir %{_libdir}/vmware/webAccess/java/jre1.5.0_07/lib/i386/headless
+%dir %{_libdir}/vmware/webAccess/java/jre1.5.0_07/lib/i386/motif21
+%dir %{_libdir}/vmware/webAccess/java/jre1.5.0_07/lib/i386/native_threads
+%dir %{_libdir}/vmware/webAccess/java/jre1.5.0_07/lib/i386/server
+%dir %{_libdir}/vmware/webAccess/java/jre1.5.0_07/lib/i386/xawt
+%endif
+%ifarch %{x8664}
+%{_libdir}/vmware/webAccess/java/jre1.5.0_07/.systemPrefs
 %attr(555,root,root) %{_libdir}/vmware/webAccess/java/jre1.5.0_07/lib/amd64/awt_robot
 %attr(555,root,root) %{_libdir}/vmware/webAccess/java/jre1.5.0_07/lib/amd64/gtkhelper
 %{_libdir}/vmware/webAccess/java/jre1.5.0_07/lib/amd64/jvm.cfg
+%{_libdir}/vmware/webAccess/java/jre1.5.0_07/lib/amd64/server/Xusage.txt
+%dir %{_libdir}/vmware/webAccess/java/jre1.5.0_07/lib/amd64/headless
+%dir %{_libdir}/vmware/webAccess/java/jre1.5.0_07/lib/amd64/motif21
+%dir %{_libdir}/vmware/webAccess/java/jre1.5.0_07/lib/amd64/native_threads
+%dir %{_libdir}/vmware/webAccess/java/jre1.5.0_07/lib/amd64/server
+%dir %{_libdir}/vmware/webAccess/java/jre1.5.0_07/lib/amd64/xawt
+%endif
 %{_libdir}/vmware/webAccess/java/jre1.5.0_07/lib/classlist
 %{_libdir}/vmware/webAccess/java/jre1.5.0_07/lib/content-types.properties
 %{_libdir}/vmware/webAccess/java/jre1.5.0_07/lib/flavormap.properties
@@ -738,12 +771,6 @@ fi
 %{_libdir}/vmware/webAccess/java/jre1.5.0_07/lib/logging.properties
 %{_libdir}/vmware/webAccess/java/jre1.5.0_07/lib/net.properties
 %{_libdir}/vmware/webAccess/java/jre1.5.0_07/lib/sound.properties
-%{_libdir}/vmware/webAccess/java/jre1.5.0_07/lib/amd64/server/Xusage.txt
-%dir %{_libdir}/vmware/webAccess/java/jre1.5.0_07/lib/amd64/headless
-%dir %{_libdir}/vmware/webAccess/java/jre1.5.0_07/lib/amd64/motif21
-%dir %{_libdir}/vmware/webAccess/java/jre1.5.0_07/lib/amd64/native_threads
-%dir %{_libdir}/vmware/webAccess/java/jre1.5.0_07/lib/amd64/server
-%dir %{_libdir}/vmware/webAccess/java/jre1.5.0_07/lib/amd64/xawt
 
 %defattr(444,root,root,755)
 %dir %{_libdir}/vmware/webAccess/tomcat