]> git.pld-linux.org Git - packages/VMware-workstation.git/blobdiff - VMware-workstation.spec
projects / packages / VMware-workstation.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
- Requires: gtk+2 <= 2:2.8.8-1
[packages/VMware-workstation.git] / VMware-workstation.spec
diff --git a/VMware-workstation.spec b/VMware-workstation.spec
index 8592cb174227c047956813402b8da95515174479..0340761512dda96c611535058350b0bba27d2d4b 100644 (file)
--- a/VMware-workstation.spec
+++ b/VMware-workstation.spec
@@ -16,11 +16,15 @@
 %if %{with kernel24}
 %define         _kernelsrcdir          /usr/src/linux-2.4
 %endif
+
+%ifarch %{x8664}
+%undefine      with_userspace
+%endif
 #
 %define                _ver    5.5.1
 %define                _build  19175
 %define                _rel    0.2
-%define                _urel   96
+%define                _urel   101
 %define                _ccver  %(rpm -q --qf "%{VERSION}" gcc)
 #
 Summary:       VMware Workstation
@@ -32,8 +36,8 @@ License:      custom, non-distributable
 Group:         Applications/Emulators
 Source0:       http://download3.vmware.com/software/wkst/%{name}-%{_ver}-%{_build}.tar.gz
 # NoSource0-md5:       6101deb381beb49f5b99cb1f8a81a532
-#Source1:      http://knihovny.cvut.cz/ftp/pub/vmware/vmware-any-any-update%{_urel}.tar.gz
-## Source1-md5:        79dd91c65f3719bb7847d63b314706c3
+Source1:       http://knihovny.cvut.cz/ftp/pub/vmware/vmware-any-any-update%{_urel}.tar.gz
+# Source1-md5: b3ce457f5b9ae8b606fd70f56084877d
 Source2:       %{name}.init
 Source3:       %{name}-vmnet.conf
 Source4:       %{name}.png
@@ -45,14 +49,15 @@ Patch1:             %{name}-run_script.patch
 NoSource:      0
 URL:           http://www.vmware.com/
 BuildRequires: gcc-c++
-%{?with_dist_kernel:BuildRequires:     kernel-module-build >= 2.6.7}
+%{?with_dist_kernel:BuildRequires:     kernel-module-build >= 3:2.6.7}
 BuildRequires: rpm-perlprov
-BuildRequires: rpmbuild(macros) >= 1.217
+BuildRequires: rpmbuild(macros) >= 1.268
 BuildRequires: sed >= 4.0
+Requires:      gtk+2 <= 2:2.8.8-1
 Requires:      kernel(vmmon) = %{version}-%{_rel}
 Requires:      libgnomecanvasmm
 Requires:      libview >= 0.5.5-2
-ExclusiveArch: %{ix86}
+ExclusiveArch: %{ix86} %{x8664}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _noautoprovfiles %{_libdir}/vmware/lib/.*\.so.*
@@ -273,19 +278,21 @@ SMP kernel module for VMware Workstation - vmnet-smp.
 Modu³y j±dra SMP dla VMware Workstation - vmnet-smp.
 
 %prep
-%setup -q -n vmware-distrib
-#%setup -qDT -n vmware-distrib -a1
-mkdir vmware-any-any-update%{_urel}
+#%setup -q -n vmware-distrib
+%setup -qDT -n vmware-distrib -a1
+#mkdir vmware-any-any-update%{_urel}
 cd vmware-any-any-update%{_urel}
-#tar xf vmmon.tar
-#tar xf vmnet.tar
-tar xf ../lib/modules/source/vmmon.tar
-tar xf ../lib/modules/source/vmnet.tar
+tar xf vmmon.tar
+tar xf vmnet.tar
+#tar xf ../lib/modules/source/vmmon.tar
+#tar xf ../lib/modules/source/vmnet.tar
 #%patch0 -p0
 cp -a vmmon-only{,.clean}
 cp -a vmnet-only{,.clean}
+sed -e 's/filter x86_64%/filter x86_64% amd64% ia64%/' \
+       -i vmnet-only.clean/Makefile.kernel
 cd -
-%patch1 -p1
+#%patch1 -p1
 
 %build
 sed -i 's:vm_db_answer_LIBDIR:VM_LIBDIR:g;s:vm_db_answer_BINDIR:VM_BINDIR:g' bin/vmware
@@ -314,16 +321,30 @@ for mod in vmmon vmnet ; do
                rm -rf $mod-only
                cp -a $mod-only.clean $mod-only
                cd $mod-only
-               install -d include/{linux,config}
-               touch include/config/MARKER
-               ln -sf %{_kernelsrcdir}/config-$cfg .config
-               ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h include/linux/autoconf.h
-               ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm
-               ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm-%{_target_base_arch}
-               ln -sf %{_kernelsrcdir}/Module.symvers-$cfg Module.symvers
+               install -d o/include/linux
+               ln -sf %{_kernelsrcdir}/config-$cfg o/.config
+               ln -sf %{_kernelsrcdir}/Module.symvers-$cfg o/Module.symvers
+               ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h o/include/linux/autoconf.h
+       if grep -q "^CONFIG_PREEMPT_RT=y$" o/.config; then
+               sed -e '/pollQueueLock/s/SPIN_LOCK_UNLOCKED/SPIN_LOCK_UNLOCKED(pollQueueLock)/' \
+                       -e '/timerLock/s/SPIN_LOCK_UNLOCKED/SPIN_LOCK_UNLOCKED(timerLock)/' \
+                       -i ../vmmon-only/linux/driver.c
+               sed -e 's/SPIN_LOCK_UNLOCKED/SPIN_LOCK_UNLOCKED(vnetHubLock)/' \
+                       -i ../vmnet-only/hub.c
+               sed -e 's/RW_LOCK_UNLOCKED/RW_LOCK_UNLOCKED(vnetPeerLock)/' \
+                       -i ../vmnet-only/driver.c
+       fi
+       %if %{with dist_kernel}
+               %{__make} -C %{_kernelsrcdir} O=$PWD/o prepare scripts
+       %else
+               install -d o/include/config
+               touch o/include/config/MARKER
+               ln -sf %{_kernelsrcdir}/scripts o/scripts
+               %endif
                %{__make} -C %{_kernelsrcdir} modules \
                        VMWARE_VER=VME_V5 \
-                       M=$PWD O=$PWD \
+                       SRCROOT=$PWD \
+                       M=$PWD O=$PWD/o \
                        VM_KBUILD=26 \
                        %{?with_verbose:V=1} \
                        VM_CCVER=%{_ccver}
@@ -335,7 +356,7 @@ done
 %else
 for mod in vmmon vmnet ; do
        rm -rf $mod-only
-       tar xf $mod.tar
+       tar xf ../lib/modules/source/$mod.tar
        cd $mod-only
        sed -i s/'^HEADER_DIR.*'/'HEADER_DIR = \/usr\/src\/linux-2.4\/include'/ Makefile
        sed -i s/'^BUILD_DIR.*'/'BUILD_DIR = .'/ Makefile
@@ -451,6 +472,7 @@ EOF
 install bin/vmware $RPM_BUILD_ROOT%{_bindir}
 install lib/bin/vmware $RPM_BUILD_ROOT%{_libdir}/vmware/bin
 cp -r  lib/lib $RPM_BUILD_ROOT%{_libdir}/vmware
+cp -r  lib/libconf $RPM_BUILD_ROOT%{_libdir}/vmware
 %else
 install lib/bin/vmware $RPM_BUILD_ROOT%{_bindir}
 %endif
@@ -461,17 +483,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %post networking
 /sbin/chkconfig --add vmnet
-if [ -r /var/lock/subsys/vmnet ]; then
-       /etc/rc.d/init.d/vmnet restart >&2
-else
-       echo "Run \"/etc/rc.d/init.d/vmnet start\" to start VMware networking service."
-fi
+%service vmnet restart "VMware networking service"
 
 %preun networking
 if [ "$1" = "0" ]; then
-       if [ -r /var/lock/subsys/vmnet ]; then
-               /etc/rc.d/init.d/vmnet stop >&2
-       fi
+       %service vmnet stop
        /sbin/chkconfig --del vmnet
 fi
 
@@ -542,7 +558,8 @@ fi
 %{_libdir}/vmware/isoimages
 %if %{with internal_libs}
 %attr(755,root,root) %{_libdir}/vmware/bin/vmware
-%{_libdir}/vmware/lib
+%dir %{_libdir}/vmware/lib
+%{_libdir}/vmware/lib/lib*
 %attr(755,root,root) %{_libdir}/vmware/lib/wrapper-gtk24.sh
 %endif
 %{_libdir}/vmware/licenses
VMware Workstation
This page took 0.101268 seconds and 4 git commands to generate.