--- rpms/smeserver-openvpn-bridge/contribs7/smeserver-openvpn-bridge.spec	2010/03/03 04:02:52	1.33
+++ rpms/smeserver-openvpn-bridge/contribs7/smeserver-openvpn-bridge.spec	2012/03/20 15:38:58	1.45
@@ -1,4 +1,4 @@
-# $Id: smeserver-openvpn-bridge.spec,v 1.32 2009/11/18 08:13:58 vip-ire Exp $
+# $Id: smeserver-openvpn-bridge.spec,v 1.44 2011/04/27 16:48:13 slords Exp $
 # Authority: vip-ire
 # Name: Daniel Berteaud
 
@@ -6,7 +6,7 @@ Summary: OpenVPN, a strong VPN solution
 %define name smeserver-openvpn-bridge
 Name: %{name}
 %define version 2.0
-%define release 34
+%define release 46
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -53,6 +53,22 @@ Patch36: smeserver-openvpn-bridge-2.0-lo
 Patch37: smeserver-openvpn-bridge-2.0-code_cleanup1.patch
 Patch38: smeserver-openvpn-bridge-2.0-code_cleanup2.patch
 Patch39: smeserver-openvpn-bridge-2.0-locale-2010-03-02.patch
+Patch40: smeserver-openvpn-bridge-2.0-set_tos.patch
+Patch41: smeserver-openvpn-bridge-2.0-push_complzo.patch
+Patch42: smeserver-openvpn-bridge-2.0-locale-2010-04-29.patch
+Patch43: smeserver-openvpn-bridge-2.0-comment_passtos.patch
+Patch44: smeserver-openvpn-bridge-2.0-log_timestamp.patch
+Patch45: smeserver-openvpn-bridge-2.0-return_pass_tos_comment.patch
+Patch46: smeserver-openvpn-bridge-2.0-locale-2010-06-02.patch
+Patch47: smeserver-openvpn-bridge-2.0-locale-2010-07-19.patch
+Patch48: smeserver-openvpn-bridge-2.0-templates_cleanup.patch
+Patch49: smeserver-openvpn-bridge-2.0-option_to_disable_route_push.patch
+Patch50: smeserver-openvpn-bridge-2.0-toggle_passtos.patch
+Patch51: smeserver-openvpn-bridge-2.0-enhance_routes_push.patch
+Patch52: smeserver-openvpn-bridge-2.0-add_complzo_back.patch
+Patch53: smeserver-openvpn-bridge-2.0-locale-2011-03-06.patch
+Patch54: smeserver-openvpn-bridge-2.0-locale-2011-04-27.patch
+Patch55: smeserver-openvpn-bridge-2.0-locale-2012-03-20.patch
 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
@@ -71,6 +87,47 @@ This package contains all the needed scr
 to have a full working openvpn server running in bridge mode.
 
 %changelog
+* Tue Mar 20 2012 SME Translation Server <translations@contribs.org> 2.0-46.el6
+- apply locale 2012-03-20 patch
+
+* Wed Apr 27 2011 SME Translation Server <translations@contribs.org> 2.0-45.sme
+- apply locale 2011-04-27 patch
+
+* Sun Mar 06 2011 SME Translation Server <translations@contribs.org> 2.0-44.sme
+- apply locale 2011-03-06 patch
+
+* Thu Feb 17 2011 Daniel B. <daniel@firewall-services.com> 2.0-43.sme
+- Fix a typo in the panel [SME: 6509]
+
+* Tue Jan 25 2011 Daniel B. <daniel@firewall-services.com> 2.0-42.sme
+- Stop disabling service on rpm removal (spec change only)
+
+* Tue Jan 25 2011 Daniel B. <daniel@firewall-services.com> 2.0-41.sme
+- Add comp-lzo option back into client conf file
+
+* Tue Oct 26 2010 Daniel B. <daniel@firewall-services.com> 2.0-40.sme
+- Add PassTOS DB key to enable/disable passtos
+- Enhance routes push (work with s2s contrib)
+
+* Tue Oct 19 2010  Daniel B. <daniel@firewall-services.com> 2.0-39.sme
+- templates cleanup
+- DB prop to disable local networks routes push to client
+
+* Mon Jul 19 2010 Daniel B. <daniel@firewall-services.com> 2.0-38.sme
+- apply locale 2010-07-19 patc
+
+* Wed Jun 02 2010 Daniel B. <daniel@firewall-services.com> 2.0-37.sme
+- apply locale 2010-06-02 patch
+- use multilog timestamp
+
+* Wed May 12 2010 Daniel B. <daniel@firewall-services.com> 2.0-36.sme
+- Comment the passtos option as it's not supported on Windows
+
+* Fri Apr 30 2010 Daniel B. <daniel@firewall-services.com> 2.0-35.sme
+- add the passtos option
+- push the comp-lzo option to the client
+- apply locale 2010-04-29 patch
+
 * Tue Mar 02 2010 SME Translation Server <translations@contribs.org> 2.0-34.sme
 - apply locale 2010-03-02 patch
 
@@ -263,6 +320,22 @@ to have a full working openvpn server ru
 %patch37 -p1
 %patch38 -p1
 %patch39 -p1
+%patch40 -p1
+%patch41 -p1
+%patch42 -p1
+%patch43 -p1
+%patch44 -p1
+%patch45 -p1
+%patch46 -p1
+%patch47 -p1
+%patch48 -p1
+%patch49 -p1
+%patch50 -p1
+%patch51 -p1
+%patch52 -p1
+%patch53 -p1
+%patch54 -p1
+%patch55 -p1
 
 %build
 perl createlinks
@@ -296,9 +369,3 @@ rm -rf $RPM_BUILD_ROOT
 %post
 
 %preun
-if [ $1 -eq 0 ] ; then
- /sbin/e-smith/db configuration setprop openvpn-bridge status disabled
- sv d /service/openvpn-bridge
-fi
-
-true