--- rpms/smeserver-openvpn-s2s/contribs7/smeserver-openvpn-s2s.spec	2010/11/02 16:43:51	1.1
+++ rpms/smeserver-openvpn-s2s/contribs7/smeserver-openvpn-s2s.spec	2011/04/19 11:57:41	1.9
@@ -1,4 +1,4 @@
-# $Id: smeserver-openvpn-s2s.spec,v 1.37 2010/07/19 08:43:15 vip-ire Exp $
+# $Id: smeserver-openvpn-s2s.spec,v 1.8 2011/03/06 15:28:16 slords Exp $
 # Authority: vip-ire
 # Name: Daniel Berteaud
 
@@ -6,7 +6,7 @@ Summary: OpenVPN, a strong VPN solution
 %define name smeserver-openvpn-s2s
 Name: %{name}
 %define version 0.1
-%define release 11
+%define release 18
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -39,10 +39,17 @@ Patch22: smeserver-openvpn-s2s-0.1-fix_c
 Patch23: smeserver-openvpn-s2s-0.1-fix_removable_typo.patch
 Patch24: smeserver-openvpn-s2s-0.1-expand_and_restart_smb.patch
 Patch25: smeserver-openvpn-s2s-0.1-remove_nice.patch
+Patch26: smeserver-openvpn-s2s-0.1-locale-2010-11-04.patch
+Patch27: smeserver-openvpn-s2s-0.1-locale-2010-11-08.patch
+Patch28: smeserver-openvpn-s2s-0.1-fix_type_variable.patch
+Patch29: smeserver-openvpn-s2s-0.1-remove_useless_samba_template.patch
+Patch30: smeserver-openvpn-s2s-0.1-locale-2011-03-06.patch
+Patch31: smeserver-openvpn-s2s-0.1-reduce_ping_restart.patch
 
 BuildArchitectures: noarch
 
 BuildRequires: e-smith-devtools
+BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 
 Requires: e-smith-base
 Requires: openvpn >= 2.1
@@ -52,6 +59,27 @@ This package contains all the needed scr
 to run openvpn in client or server mode for site to site tunnels
 
 %changelog
+* Tue Apr 19 2011 Daniel Berteaud <daniel@firewall-services.com> 0.1-18.sme
+- Reduce inactivity timeout
+
+* Sun Mar 06 2011 SME Translation Server <translations@contribs.org> 0.1-17.sme
+- apply locale 2011-03-06 patch
+
+* Tue Jan 25 2011 Daniel Berteaud <daniel@firewall-services.com> 0.1-16.sme
+- Stop disabling service on rpm removal (spec change only)
+
+* Tue Dec 7 2010 Daniel Berteaud <daniel@firewall-services.com> 0.1-15.sme
+- Remove useless smb.conf template
+
+* Tue Dec 7 2010 Daniel Berteaud <daniel@firewall-services.com> 0.1-14.sme
+- Fix type variable (thks M. Doerner)
+
+* Mon Nov 8 2010 Daniel Berteaud <daniel@firewall-services.com> 0.1-13.sme
+- Apply locale 2010-11-08 patch
+
+* Thu Nov 4 2010 Daniel Berteaud <daniel@firewall-services.com> 0.1-12.sme
+- Apply locale 2010-11-04 patch 
+
 * Tue Nov 02 2010 Daniel Berteaud <daniel@firewall-services.com> 0.1-11.sme
 - Remove the nice directive
 
@@ -122,6 +150,12 @@ to run openvpn in client or server mode
 %patch23 -p1
 %patch24 -p1
 %patch25 -p1
+%patch26 -p1
+%patch27 -p1
+%patch28 -p1
+%patch29 -p1
+%patch30 -p1
+%patch31 -p1
 
 %build
 perl createlinks
@@ -152,10 +186,4 @@ rm -rf $RPM_BUILD_ROOT
 %post
 
 %preun
-if [ $1 -eq 0 ] ; then
- /sbin/e-smith/db configuration setprop openvpn-s2s status disabled
- /etc/rc.d/init.d/openvpn-s2s stop
-fi
-
-true