- 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 17a37ec3850cb34ea73349f339448e61e2c90439..f6bce9b96afdf1f4a7c0b800b6e053a6866ea51c 100644 (file)
--- a/cisco-vpnclient.spec
+++ b/cisco-vpnclient.spec
@@ -1,4 +1,5 @@
-#
+# TODO:
+# - /opt ??????
 # Conditional build:
 %bcond_without dist_kernel     # without distribution kernel
 %bcond_without kernel          # don't build kernel modules
@@ -6,26 +7,29 @@
 %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
 Summary:       Cisco Systems VPN Client
 Summary(pl):   Klient VPN produkcji Cisco Systems
 Name:          cisco-vpnclient
-Version:       4.6.02.0030_k9
+Version:       4.7.00.0640_k9
 Release:       %{_rel}
 License:       Commercial
-Vendor:                Cisco Systems
 Group:         Networking
-Source0:       vpnclient-linux-4.6.02.0030-k9.tar.gz
+Source0:       vpnclient-linux-4.7.00.0640-k9.tar.gz
 # NoSource0-md5:       435dd370208643e526623ddfca6e938a
-Source1:       cisco_vpnclient.init
+Source1:       vpnclient-linux-x86_64-4.7.00.0640-k9.tar.gz
+Source2:       cisco_vpnclient.init
 NoSource:      0
-URL:           http://www.cisco.com/
-%{?with_dist_kernel:BuildRequires:     kernel-module-build >= 2.6.0}
-BuildRequires: rpmbuild(macros) >= 1.153
-ExclusiveArch: %{ix86}
+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)
 
 %description
@@ -54,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
@@ -67,9 +70,16 @@ Cisco Systems VPN Client - Linux SMP kernel module.
 Klient VPN produkcji Cisco Systems - modu³ j±dra Linuksa SMP.
 
 %prep
-%setup -q -n vpnclient
+%setup -q -T -c
+%ifarch %{ix86}
+tar -zxvf %{SOURCE0}
+%endif
+%ifarch %{x8664}
+tar -zxvf %{SOURCE1}
+%endif
 
 %build
+cd vpnclient
 %if %{with kernel}
 for cfg in %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist}; do
        if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then
@@ -81,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
@@ -98,6 +108,7 @@ done
 
 %install
 rm -rf $RPM_BUILD_ROOT
+cd vpnclient
 
 %if %{with kernel}
 install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/misc
@@ -111,16 +122,11 @@ install cisco_ipsec-smp.ko \
 %endif
 
 %if %{with userspace}
-install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
+install -d $RPM_BUILD_ROOT{/etc/rc.d/init.d,%{_sbindir}} \
+       $RPM_BUILD_ROOT%{_sysconfdir}/opt/cisco-vpnclient/{Certificates,Profiles} \
+       $RPM_BUILD_ROOT/opt/cisco-vpnclient/{bin,lib,include}
 
-install -d $RPM_BUILD_ROOT%{_sbindir}
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/opt/cisco-vpnclient/Certificates
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/opt/cisco-vpnclient/Profiles
-
-install -d $RPM_BUILD_ROOT/opt/cisco-vpnclient/bin
-install -d $RPM_BUILD_ROOT/opt/cisco-vpnclient/lib
-install -d $RPM_BUILD_ROOT/opt/cisco-vpnclient/include
+install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
 
 install {cisco_cert_mgr,vpnclient,cvpnd,ipseclog} $RPM_BUILD_ROOT/opt/cisco-vpnclient/bin
 install libvpnapi.so $RPM_BUILD_ROOT/opt/cisco-vpnclient/lib
@@ -138,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
@@ -167,7 +167,7 @@ fi
 %if %{with userspace}
 %files
 %defattr(644,root,root,755)
-%doc license.txt sample.pcf
+%doc vpnclient/license.txt vpnclient/sample.pcf
 %dir /opt/cisco-vpnclient
 %dir /opt/cisco-vpnclient/bin
 %dir /opt/cisco-vpnclient/lib