- 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 bb0435530ef3b4a624f14380919d5d566f7fae3c..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
@@ -17,16 +17,18 @@ Name:               cisco-vpnclient
 Version:       4.7.00.0640_k9
 Release:       %{_rel}
 License:       Commercial
-Vendor:                Cisco Systems
 Group:         Networking
 Source0:       vpnclient-linux-4.7.00.0640-k9.tar.gz
 # NoSource0-md5:       435dd370208643e526623ddfca6e938a
 Source1:       vpnclient-linux-x86_64-4.7.00.0640-k9.tar.gz
 Source2:       cisco_vpnclient.init
 NoSource:      0
+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 >= 2.6.0}
-BuildRequires: rpmbuild(macros) >= 1.153
+%{?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)
 
@@ -56,7 +58,6 @@ Summary:      Cisco Systems VPN Client - SMP kernel module
 Summary(pl):   Klient VPN produkcji Cisco Systems - modu³ j±dra SMP
 Release:       %{_rel}@%{_kernel_ver_str}
 License:       Commercial
-Vendor:                Cisco Systems
 Group:         Base/Kernel
 %{?with_dist_kernel:%requires_releq_kernel_smp}
 Requires(post,postun): /sbin/depmod
@@ -69,7 +70,7 @@ Cisco Systems VPN Client - Linux SMP kernel module.
 Klient VPN produkcji Cisco Systems - modu³ j±dra Linuksa SMP.
 
 %prep
-%setup -q -T -c -n %{name}-%{version}
+%setup -q -T -c
 %ifarch %{ix86}
 tar -zxvf %{SOURCE0}
 %endif
@@ -90,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
@@ -143,18 +144,12 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/chkconfig --add cisco-vpnclient
-if [ -f /var/lock/subsys/cisco-vpnclient ]; then
-        /etc/rc.d/init.d/cisco-vpnclient restart >&2
-else
-        echo "Run '/etc/rc.d/init.d/cisco-vpnclient start' to start vpnclient support." >&2
-fi
+%service cisco-vpnclient restart
 
 %preun
 if [ "$1" = "0" ]; then
-        if [ -f /var/lock/subsys/cisco-vpnclient ]; then
-                /etc/rc.d/init.d/cisco-vpnclient stop >&2
-        fi
-        /sbin/chkconfig --del cisco-vpnclient >&2
+       %service cisco-vpnclient stop
+       /sbin/chkconfig --del cisco-vpnclient
 fi
 
 %post  -n kernel-net-cisco_ipsec