X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=VMware-player.spec;h=96d750abb14f802b72ad7b4a9358de9e6b46a755;hb=397503c25146208bed12f8fc942f7641a141053d;hp=d9e1ce3c51eccc63397859898980a901a110bb78;hpb=6f6022e1d1e69b6d03da6e0d12c2800a09a2d61e;p=packages%2FVMware-player.git

diff --git a/VMware-player.spec b/VMware-player.spec
index d9e1ce3..96d750a 100644
--- a/VMware-player.spec
+++ b/VMware-player.spec
@@ -8,31 +8,34 @@
 #
 %include	/usr/lib/rpm/macros.perl
 
+%if %{without kernel}
+%undefine	with_dist_kernel
+%endif
 %ifarch %{x8664}
 %undefine	with_userspace
 %endif
 #
-%define		_ver	2.0.0
-%define		_build	45731
-%define		_rel	0.2
-%define		_urel	110
-%define		_ccver	%(rpm -q --qf "%{VERSION}" gcc)
+%define		ver		2.0.2
+%define		buildid	59824
+%define		urel	115
+%define		ccver	%(rpm -q --qf '%{V}' gcc)
+%define		_rel	0.10
 #
 Summary:	VMware player
 Summary(pl.UTF-8):	VMware player - wirtualna platforma dla stacji roboczej
 Name:		VMware-player
-Version:	%{_ver}.%{_build}
+Version:	%{ver}.%{buildid}
 Release:	%{_rel}
 License:	custom, non-distributable
 Group:		Applications/Emulators
-Source0:	http://download3.vmware.com/software/vmplayer/%{name}-%{_ver}-%{_build}.i386.tar.gz
-# NoSource0-md5:	090b02f6a49dd3a4e8617f68e1d2dc7b
+Source0:	http://download3.vmware.com/software/vmplayer/%{name}-%{ver}-%{buildid}.i386.tar.gz
+# NoSource0-md5:	0c108db615943d71b78f18826611acce
 NoSource:	0
-Source1:	http://download3.vmware.com/software/vmplayer/%{name}-%{_ver}-%{_build}.x86_64.tar.gz
-# NoSource1-md5:	2bfbc79f548f082818b44b980d9e1c71	
+Source1:	http://download3.vmware.com/software/vmplayer/%{name}-%{ver}-%{buildid}.x86_64.tar.gz
+# NoSource1-md5:	f59a77f3e3b8e87591eff605c4bbb796
 NoSource:	1
-Source2:	http://knihovny.cvut.cz/ftp/pub/vmware/vmware-any-any-update%{_urel}.tar.gz
-# Source2-md5:	6a0c8da95b4c25670c842939e5b92728
+Source2:	http://knihovny.cvut.cz/ftp/pub/vmware/vmware-any-any-update%{urel}.tar.gz
+# Source2-md5:	ab33ff7a799fee77f0f4ba5667cd4b9a
 Source3:	%{name}-vmnet.conf
 Source4:	%{name}.png
 Source5:	%{name}.desktop
@@ -41,15 +44,15 @@ Source7:	%{name}-dhcpd.conf
 Source8:	%{name}.init
 Patch0:		%{name}-Makefile.patch
 Patch1:		%{name}-run_script.patch
-NoSource:	0
 URL:		http://www.vmware.com/
-BuildRequires:	gcc-c++
 %{?with_dist_kernel:BuildRequires:	kernel-module-build >= 3:2.6.7}
+BuildRequires:	libstdc++-devel
 BuildRequires:	rpm-perlprov
 BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	sed >= 4.0
 Requires:	libgnomecanvasmm
 Requires:	libview >= 0.5.5-2
+Requires:	openssl >= 0.9.7
 ExclusiveArch:	%{ix86} %{x8664}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -84,7 +87,6 @@ Summary:	VMware Player help files
 Summary(pl.UTF-8):	Pliki pomocy dla VMware Player
 Group:		Applications/Emulators
 Requires:	%{name} = %{version}-%{release}
-Requires:	mozilla
 
 %description help
 VMware Player help files.
@@ -147,7 +149,7 @@ Moduły jądra dla VMware Player - vmnet.
 
 %prep
 %setup -q -n vmware-player-distrib -a2
-cd vmware-any-any-update%{_urel}
+cd vmware-any-any-update%{urel}
 tar xf vmmon.tar
 tar xf vmnet.tar
 cp -a vmmon-only{,.clean}
@@ -156,12 +158,32 @@ sed -e 's/filter x86_64%/filter x86_64% amd64% ia64%/' \
 	-i vmnet-only.clean/Makefile.kernel
 cd -
 
+%patch0 -p1
+%patch1 -p1
+
+# will never use these
+rm -f lib/libconf/lib/gtk-2.0/2.10.0/engines/*.a
+rm -f lib/libconf/lib/gtk-2.0/2.10.0/immodules/*.a
+rm -f lib/libconf/lib/gtk-2.0/2.10.0/loaders/*.a
+rm -f lib/libconf/lib/pango/1.5.0/modules/*.a
+
+%{__sed} -i -e 's#/build/.*/libconf/#%{_libdir}/vmware/libconf/#' \
+	lib/libconf/etc/gtk-2.0/{gdk-pixbuf.loaders,gtk.immodules} \
+	lib/libconf/etc/pango/{pango.modules,pangorc}
+
+# typo?
+%{__sed} -i -e 's#/etc/pango/pango/pangox.aliases#/etc/pango/pangox.aliases#' \
+	lib/libconf/etc/pango/pangorc
+
 %build
 sed -i 's:vm_db_answer_LIBDIR:VM_LIBDIR:g;s:vm_db_answer_BINDIR:VM_BINDIR:g' bin/vmplayer
 
-cd vmware-any-any-update%{_urel}
+cd vmware-any-any-update%{urel}
 chmod u+w ../lib/bin/vmware-vmx ../lib/bin-debug/vmware-vmx ../bin/vmnet-bridge
 
+# hack until new any-any-update version available
+sed -i -e 's/#define.*VMMON_VERSION_V6.*/#define VMMON_VERSION_V6		(167 << 16 | 0)/g' vmmon-only.clean/include/iocontrols_compat.h
+
 %if %{with kernel}
 rm -rf built
 mkdir built
@@ -200,7 +222,7 @@ for mod in vmmon vmnet ; do
 			M=$PWD O=$PWD/o \
 			VM_KBUILD=26 \
 			%{?with_verbose:V=1} \
-			VM_CCVER=%{_ccver}
+			VM_CCVER=%{ccver}
 		mv -f $mod.ko ../built/$mod-$cfg.ko
 		cd -
 	done
@@ -218,15 +240,19 @@ install -d \
 	$RPM_BUILD_ROOT%{_libdir}/vmware/{bin,lib,share/pixmaps} \
 	$RPM_BUILD_ROOT%{_mandir} \
 	$RPM_BUILD_ROOT%{_pixmapsdir} \
+	$RPM_BUILD_ROOT%{_iconsdir}/hicolor \
 	$RPM_BUILD_ROOT%{_desktopdir} \
 	$RPM_BUILD_ROOT/etc/rc.d/init.d \
 	$RPM_BUILD_ROOT/var/run/vmware
 %endif
 
 %if %{with kernel}
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d
+echo "options vmmon vmversion=16" > $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/%{name}-vmmon.conf
+
 install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/misc
 
-cd vmware-any-any-update%{_urel}/built
+cd vmware-any-any-update%{urel}/built
 install vmmon* $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/vmmon.ko
 install vmnet* $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/vmnet.ko
 cd -
@@ -243,8 +269,10 @@ install %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/vmware/vmnet8/dhcpd/dhcpd.conf
 touch $RPM_BUILD_ROOT%{_sysconfdir}/vmware/vmnet8/dhcpd/dhcpd.leases
 touch $RPM_BUILD_ROOT%{_sysconfdir}/vmware/vmnet8/dhcpd/dhcpd.leases~
 
+cp -a lib/share/icons/hicolor/* $RPM_BUILD_ROOT%{_iconsdir}/hicolor
+
 install lib/share/pixmaps/* $RPM_BUILD_ROOT%{_libdir}/vmware/share/pixmaps
-install doc/EULA $RPM_BUILD_ROOT%{_libdir}/vmware/share
+install doc/EULA $RPM_BUILD_ROOT%{_libdir}/vmware/share/EULA.txt
 
 install bin/*-* $RPM_BUILD_ROOT%{_bindir}
 install lib/bin/vmware-vmx $RPM_BUILD_ROOT%{_libdir}/vmware/bin
@@ -262,16 +290,32 @@ EOF
 %if %{with internal_libs}
 install bin/vmplayer $RPM_BUILD_ROOT%{_bindir}
 install lib/bin/vmplayer $RPM_BUILD_ROOT%{_libdir}/vmware/bin
-install	lib/lib/* $RPM_BUILD_ROOT%{_libdir}/vmware/lib
-cp -r	lib/libconf $RPM_BUILD_ROOT%{_libdir}/vmware
+cp -a	lib/lib/* $RPM_BUILD_ROOT%{_libdir}/vmware/lib
+cp -a	lib/libconf $RPM_BUILD_ROOT%{_libdir}/vmware
 %else
 install lib/bin/vmplayer $RPM_BUILD_ROOT%{_bindir}
+install -d $RPM_BUILD_ROOT%{_libdir}/vmware/lib/lib{crypto,ssl}.so.0.9.7
+ln -s %{_libdir}/libcrypto.so $RPM_BUILD_ROOT%{_libdir}/vmware/lib/libcrypto.so.0.9.7/libcrypto.so.0.9.7
+ln -s %{_libdir}/libssl.so $RPM_BUILD_ROOT%{_libdir}/vmware/lib/libssl.so.0.9.7/libssl.so.0.9.7
 %endif
+
+# remove not needed files
+rm -rf $RPM_BUILD_ROOT%{_bindir}/vmware-{config,uninstall}.pl $RPM_BUILD_ROOT%{_iconsdir}/hicolor/index.theme
 %endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%if %{with internal_libs}
+%post
+gdk-pixbuf-query-loaders %{_libdir}/vmware/libconf/lib/gtk-2.0/2.10.0/loaders/*.so \
+	> %{_libdir}/vmware/libconf/etc/gtk-2.0/gdk-pixbuf.loaders
+gtk-query-immodules-2.0 %{_libdir}/vmware/libconf/lib/gtk-2.0/2.10.0/immodules/*.so \
+	> %{_libdir}/vmware/libconf/etc/gtk-2.0/gtk.immodules
+pango-querymodules %{_libdir}/vmware/libconf/lib/pango/1.5.0/modules/*.so \
+	> %{_libdir}/vmware/libconf/etc/pango/pango.modules
+%endif
+
 %post networking
 /sbin/chkconfig --add vmnet
 %service vmnet restart "VMware networking service"
@@ -301,18 +345,43 @@ fi
 %dir %{_sysconfdir}/vmware
 %{_sysconfdir}/vmware/locations
 %attr(755,root,root) %{_bindir}/vmplayer
+%attr(755,root,root) %{_bindir}/vmware-acetool
+%attr(755,root,root) %{_bindir}/vm-support
 %attr(755,root,root) %{_libdir}/libvmwarebase.so.*
 %attr(755,root,root) %{_libdir}/libvmwareui.so.*
 %dir %{_libdir}/vmware
 %dir %{_libdir}/vmware/bin
-%dir %{_libdir}/vmware/lib
 # warning: SUID !!!
 %attr(4755,root,root) %{_libdir}/vmware/bin/vmware-vmx
+%dir %{_libdir}/vmware/lib
 %{_libdir}/vmware/config
 %if %{with internal_libs}
-%attr(755,root,root) %{_libdir}/vmware/bin/vmware
-%{_libdir}/vmware/lib/lib*
+%attr(755,root,root) %{_libdir}/vmware/bin/vmplayer
+%attr(755,root,root) %{_libdir}/vmware/lib/lib*
 %attr(755,root,root) %{_libdir}/vmware/lib/wrapper-gtk24.sh
+
+%dir %{_libdir}/vmware/libconf
+%dir %{_libdir}/vmware/libconf/etc
+%{_libdir}/vmware/libconf/etc/fonts
+%{_libdir}/vmware/libconf/etc/gtk-2.0
+%{_libdir}/vmware/libconf/etc/pango
+%dir %{_libdir}/vmware/libconf/lib
+%dir %{_libdir}/vmware/libconf/lib/gtk-2.0
+%dir %{_libdir}/vmware/libconf/lib/gtk-2.0/2.10.0
+%dir %{_libdir}/vmware/libconf/lib/gtk-2.0/2.10.0/engines
+%attr(755,root,root) %{_libdir}/vmware/libconf/lib/gtk-2.0/2.10.0/engines/*.so
+%dir %{_libdir}/vmware/libconf/lib/gtk-2.0/2.10.0/immodules
+%attr(755,root,root) %{_libdir}/vmware/libconf/lib/gtk-2.0/2.10.0/immodules/*.so
+%dir %{_libdir}/vmware/libconf/lib/gtk-2.0/2.10.0/loaders
+%attr(755,root,root) %{_libdir}/vmware/libconf/lib/gtk-2.0/2.10.0/loaders/*.so
+%dir %{_libdir}/vmware/libconf/lib/pango
+%dir %{_libdir}/vmware/libconf/lib/pango/1.5.0
+%dir %{_libdir}/vmware/libconf/lib/pango/1.5.0/modules
+%attr(755,root,root) %{_libdir}/vmware/libconf/lib/pango/1.5.0/modules/*.so
+%else
+# package old openssl (buggy but needed to work)
+%dir %{_libdir}/vmware/lib/libcrypto.so.0.9.7
+%attr(755,root,root) %{_libdir}/vmware/lib/libcrypto.so.0.9.7/libcrypto.so.0.9.7
 %endif
 %dir %{_libdir}/vmware/messages
 %lang(en) %{_libdir}/vmware/messages/en
@@ -320,6 +389,8 @@ fi
 %{_libdir}/vmware/share
 %{_libdir}/vmware/xkeymap
 %attr(1777,root,root) %dir /var/run/vmware
+%{_iconsdir}/hicolor/*/*/*.png
+%{_iconsdir}/hicolor/*/*/*.svg
 %{_pixmapsdir}/*.png
 %{_desktopdir}/%{name}.desktop
 
@@ -338,6 +409,7 @@ fi
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/vmware/vmnet.conf
 %attr(754,root,root) /etc/rc.d/init.d/vmnet
 %attr(755,root,root) %{_bindir}/vmnet-bridge
+%attr(755,root,root) %{_bindir}/vmnet-detect
 %attr(755,root,root) %{_bindir}/vmnet-dhcpd
 %attr(755,root,root) %{_bindir}/vmnet-natd
 %attr(755,root,root) %{_bindir}/vmnet-netifup
@@ -355,6 +427,7 @@ fi
 %if %{with kernel}
 %files -n kernel%{_alt_kernel}-misc-vmmon
 %defattr(644,root,root,755)
+%{_sysconfdir}/modprobe.d/%{name}-vmmon.conf
 /lib/modules/%{_kernel_ver}/misc/vmmon.ko*
 
 %files -n kernel%{_alt_kernel}-misc-vmnet