--- rpms/smeserver-openvpn-s2s/contribs7/smeserver-openvpn-s2s.spec	2010/12/07 19:22:50	1.5
+++ rpms/smeserver-openvpn-s2s/contribs7/smeserver-openvpn-s2s.spec	2011/03/06 15:28:16	1.8
@@ -1,4 +1,4 @@
-# $Id: smeserver-openvpn-s2s.spec,v 1.4 2010/11/08 08:36:01 vip-ire Exp $
+# $Id: smeserver-openvpn-s2s.spec,v 1.7 2011/01/25 16:56:54 vip-ire 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 14
+%define release 17
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -42,6 +42,8 @@ Patch25: smeserver-openvpn-s2s-0.1-remov
 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
 
 BuildArchitectures: noarch
 
@@ -56,6 +58,15 @@ This package contains all the needed scr
 to run openvpn in client or server mode for site to site tunnels
 
 %changelog
+* 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)
 
@@ -138,6 +149,8 @@ to run openvpn in client or server mode
 %patch26 -p1
 %patch27 -p1
 %patch28 -p1
+%patch29 -p1
+%patch30 -p1
 
 %build
 perl createlinks
@@ -168,10 +181,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