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

[packages/cisco-vpnclient.git] / cisco-vpnclient.spec

diff --git a/cisco-vpnclient.spec b/cisco-vpnclient.spec
index 795a4e67c76dd2ba34c03dbdfd63d2b4791a5a3e..f6bce9b96afdf1f4a7c0b800b6e053a6866ea51c 100644 (file)
--- a/cisco-vpnclient.spec
+++ b/cisco-vpnclient.spec
@@ -7,7 +7,7 @@
 %bcond_without userspace       # don't build userspace tools
 %bcond_with    verbose         # verbose build (V=1)
 #
-%if %{without kernel}
+%if !%{with kernel}
 %undefine with_dist_kernel
 %endif
 %define                _rel    0.1
@@ -27,6 +27,8 @@ NoSource:     1
 URL:           http://www.cisco.com/en/US/products/sw/secursw/ps2308/tsd_products_support_series_home.html
 %{?with_dist_kernel:BuildRequires:     kernel-module-build >= 3:2.6.0}
 BuildRequires: rpmbuild(macros) >= 1.268
+Requires(post,preun):  /sbin/chkconfig
+Requires:      rc-scripts
 ExclusiveArch: %{ix86} %{x8664}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -89,7 +91,7 @@ for cfg in %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist}
        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}/Module.symvers-$cfg Module.symvers
-%if %{without dist_kernel}
+%if !%{with dist_kernel}
        ln -sf %{_kernelsrcdir}/scripts
 %endif
        touch include/config/MARKER
@@ -147,7 +149,7 @@ rm -rf $RPM_BUILD_ROOT
 %preun
 if [ "$1" = "0" ]; then
        %service cisco-vpnclient stop
-       /sbin/chkconfig --del cisco-vpnclient >&2
+       /sbin/chkconfig --del cisco-vpnclient
 fi
 
 %post  -n kernel-net-cisco_ipsec