--- rpms/smeserver-openvpn-bridge/contribs7/smeserver-openvpn-bridge.spec	2010/06/02 15:56:59	1.36
+++ rpms/smeserver-openvpn-bridge/contribs7/smeserver-openvpn-bridge.spec	2012/10/08 16:17:50	1.47
@@ -1,4 +1,4 @@
-# $Id: smeserver-openvpn-bridge.spec,v 1.35 2010/05/12 13:31:03 vip-ire Exp $
+# $Id: smeserver-openvpn-bridge.spec,v 1.46 2012/10/08 16:16:35 vip-ire 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 37
+%define release 47
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -60,6 +60,15 @@ Patch43: smeserver-openvpn-bridge-2.0-co
 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
@@ -78,6 +87,38 @@ This package contains all the needed scr
 to have a full working openvpn server running in bridge mode.
 
 %changelog
+* Mon Oct 08 2012 Daniel B. <daniel@firewall-services.com> 2.0-47.sme
+- Create a tmp dir (needed for openvpn 2.2.2)
+
+* 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
@@ -289,6 +330,15 @@ to have a full working openvpn server ru
 %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,6 +346,7 @@ perl createlinks
 %{__mkdir_p} root/etc/openvpn/bridge/ccd
 %{__mkdir_p} root/etc/openvpn/bridge/priv
 %{__mkdir_p} root/etc/openvpn/bridge/pub
+%{__mkdir_p} root/etc/openvpn/bridge/tmp
 %{__mkdir_p} root/var/log/openvpn-bridge
 
 %install
@@ -309,6 +360,7 @@ perl createlinks
   --dir /etc/openvpn/bridge/pub 'attr(0755,root,root)' \
   --dir /etc/openvpn/bridge/priv 'attr(0750,root,root)' \
   --dir /etc/openvpn/bridge/ccd 'attr(0755,root,root)' \
+  --dir /etc/openvpn/bridge/tmp 'attr(0770,root,nobody)' \
   --file /usr/bin/ovpn-bridge-update-crl  'attr(0750,root,root)' \
   > %{name}-%{version}-filelist
 
@@ -322,9 +374,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