- droppded init script. It was used only to load module.

- added modprobe config to autoload cisco_ipsec module when needed.
- rel 3

Changed files:
    cisco-vpnclient.spec -> 1.40

diff --git a/cisco-vpnclient.spec b/cisco-vpnclient.spec
index 3621b911e01fbcaa48e4341e82307b3a6732e7fc..5dce1d0dbd0106fdefc4f3c17058f851ee6324c4 100644 (file)
--- a/cisco-vpnclient.spec
+++ b/cisco-vpnclient.spec
@@ -2,7 +2,7 @@
 # TODO:
 # - /opt ??????
 # - cvpnd use nobody account, permission to /proc/net and /etc/opt/cisco-vpnclient/* files and dirs
-# 
+#
 # WARNING:
 # - It does not work with kernel >= 2.6.29. I'm able to connect, but the first
 #   ip packet send via cipsec0 interface (even simple icmp echo) causes kernel
@@ -22,7 +22,7 @@
 %if !%{with kernel}
 %undefine with_dist_kernel
 %endif
-%define                _rel    2
+%define                _rel    3
 Summary:       Cisco Systems VPN Client
 Summary(pl.UTF-8):     Klient VPN produkcji Cisco Systems
 Name:          cisco-vpnclient
@@ -33,15 +33,13 @@ Group:              Networking
 # Source0-download: http://projects.tuxx-home.at/ciscovpn/clients/linux/
 Source0:       vpnclient-linux-x86_64-4.8.02.0030-k9.tar.gz
 # NoSource0-md5:       de869c26dbc3b8851759907855dee48c
-Source1:       cisco_vpnclient.init
+Source1:       %{name}.modprobe
 NoSource:      0
 # patches - http://projects.tuxx-home.at/?id=cisco_vpn_client
 Patch1:                %{name}-skbuff_offset.patch
 URL:           http://www.cisco.com/en/US/products/sw/secursw/ps2308/tsd_products_support_series_home.html
 %{?with_dist_kernel:BuildRequires:     kernel%{_alt_kernel}-module-build >= 3:2.6.22}
 BuildRequires: rpmbuild(macros) >= 1.379
-Requires(post,preun):  /sbin/chkconfig
-Requires:      rc-scripts
 ExclusiveArch: %{ix86} %{x8664}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -84,11 +82,11 @@ cd vpnclient
 %endif
 
 %if %{with userspace}
-install -d $RPM_BUILD_ROOT{/etc/rc.d/init.d,%{_sbindir}} \
+install -d $RPM_BUILD_ROOT{/etc/modprobe.d,%{_sbindir}} \
        $RPM_BUILD_ROOT%{_sysconfdir}/opt/cisco-vpnclient/{Certificates,Profiles} \
        $RPM_BUILD_ROOT/opt/cisco-vpnclient/{bin,lib,include}
 
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
+install %{SOURCE1} $RPM_BUILD_ROOT/etc/modprobe.d/cisco-vpnclient.conf
 
 install {cisco_cert_mgr,vpnclient,cvpnd,ipseclog} $RPM_BUILD_ROOT/opt/cisco-vpnclient/bin
 install libvpnapi.so $RPM_BUILD_ROOT/opt/cisco-vpnclient/lib
@@ -104,16 +102,6 @@ ln -sf %{_sysconfdir}/opt/cisco-vpnclient $RPM_BUILD_ROOT%{_sysconfdir}/CiscoSys
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-/sbin/chkconfig --add cisco-vpnclient
-%service cisco-vpnclient restart
-
-%preun
-if [ "$1" = "0" ]; then
-       %service cisco-vpnclient stop
-       /sbin/chkconfig --del cisco-vpnclient
-fi
-
 %post  -n kernel%{_alt_kernel}-net-cisco_ipsec
 %depmod %{_kernel_ver}
 
@@ -140,11 +128,11 @@ fi
 /opt/cisco-vpnclient/include/*
 %attr(755,root,root) %{_sysconfdir}/CiscoSystemsVPNClient
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/opt/cisco-vpnclient/vpnclient.ini
-%attr(754,root,root) /etc/rc.d/init.d/%{name}
 %endif
 
 %if %{with kernel} || %{with dist_kernel}
 %files -n kernel%{_alt_kernel}-net-cisco_ipsec
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/misc/*ko*
+/etc/modprobe.d/cisco-vpnclient.conf
 %endif