- don't use %{without ...}, it may not work after inverting bcond

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

diff --git a/VMware-server.spec b/VMware-server.spec
index 0eb108a71e40d5d7412cc66546d49add876f46b3..394abae95bba47df5b01519689a1d89596a3f783 100644 (file)
--- a/VMware-server.spec
+++ b/VMware-server.spec
@@ -43,14 +43,11 @@ Release:    %{_rel}
 License:       custom, non-distributable
 Group:         Applications/Emulators
 Source0:       http://download3.vmware.com/software/vmserver/%{name}-%{_ver}-%{_build}.tar.gz
-# Source0-md5: a25b4beb53785c05ef3b3077d87f6e2b
 # NoSource0-md5:       a25b4beb53785c05ef3b3077d87f6e2b
 Source1:       http://download3.vmware.com/software/vmserver/VMware-mui-%{_ver}-%{_build}.tar.gz
-# Source1-md5: 0de45c02fcaa30ac41517b687f34b29b
 # NoSource1-md5:       0de45c02fcaa30ac41517b687f34b29b
 Source2:       http://knihovny.cvut.cz/ftp/pub/vmware/vmware-any-any-update%{_urel}.tar.gz
-# Source2-md5: 8cba16d3f6b3723b43d555a5f7cbf850
-# NoSource2-md5:       2e4ac50579cc56ca1303e7dfc156021d
+# NoSource2-md5:       8cba16d3f6b3723b43d555a5f7cbf850
 Source3:       %{name}.init
 Source4:       %{name}-vmnet.conf
 Source5:       %{name}.png
@@ -69,7 +66,6 @@ BuildRequires:        gcc-c++
 BuildRequires: rpm-perlprov
 BuildRequires: rpmbuild(macros) >= 1.268
 BuildRequires: sed >= 4.0
-Requires:      kernel(vmmon) = %{version}-%{_rel}
 Requires:      libgnomecanvasmm
 ExclusiveArch: %{ix86}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -144,7 +140,6 @@ Summary(pl):        Narz
 Group:         Applications/Emulators
 Requires(post,preun):  /sbin/chkconfig
 #Requires:     %{name} = %{version}-%{release}
-Requires:      kernel(vmnet) = %{version}-%{_rel}
 Requires:      rc-scripts
 
 %description networking
@@ -364,7 +359,7 @@ cd lib/modules/source
 rm -rf built
 mkdir built
 
-%if %{without kernel24}
+%if !%{with kernel24}
 for mod in vmmon vmnet ; do
        for cfg in %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist}; do
                if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then
@@ -387,7 +382,7 @@ for mod in vmmon vmnet ; do
                        -i ../vmnet-only/driver.c
        fi
        %if %{with dist_kernel}
-               %{__make} -C %{_kernelsrcdir} O=$PWD/o prepare scripts
+               %{__make} -j1 -C %{_kernelsrcdir} O=$PWD/o prepare scripts
        %else
                install -d o/include/config
                touch o/include/config/MARKER
@@ -480,7 +475,7 @@ install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/misc
 #cd vmware-any-any-update%{_urel}
 cd lib/modules/source
 
-%if %{without kernel24}
+%if !%{with kernel24}
 install built/vmmon-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
        $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/vmmon.ko
 install built/vmnet-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
@@ -725,7 +720,7 @@ fi
 %endif
 
 %if %{with kernel}
-%if %{without kernel24}
+%if !%{with kernel24}
 %files -n kernel-misc-vmmon
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/misc/vmmon.ko*