--- rpms/smeserver-openvpn-bridge/contribs7/smeserver-openvpn-bridge.spec	2009/03/03 18:34:43	1.10
+++ rpms/smeserver-openvpn-bridge/contribs7/smeserver-openvpn-bridge.spec	2009/03/03 18:52:41	1.11
@@ -1,4 +1,4 @@
-# $Id: smeserver-openvpn-bridge.spec,v 1.9 2009/03/03 18:34:00 snetram Exp $
+# $Id: smeserver-openvpn-bridge.spec,v 1.10 2009/03/03 18:34:43 snetram Exp $
 # Authority: vip-ire
 # Name: Daniel Berteaud
 
@@ -6,31 +6,32 @@ Summary: OpenVPN, a strong VPN solution
 %define name smeserver-openvpn-bridge
 Name: %{name}
 %define version 2.0
-%define release 14
+%define release 15
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Remote access
 Source: %{name}-%{version}.tar.gz
 
-Patch0:		smeserver-openvpn-bridge-2.0-remove_dup_migrate.patch
-Patch1:		smeserver-openvpn-bridge-2.0-pull.patch
-Patch2:		smeserver-openvpn-bridge-2.0-config_required.patch
-Patch3:		smeserver-openvpn-bridge-2.0-config_cleanup.patch
-Patch4:		smeserver-openvpn-bridge-2.0-add_rule.patch
-Patch5:		smeserver-openvpn-bridge-2.0-locale1.patch
-#Patch6:		smeserver-openvpn-bridge-2.0-openvpn_db.patch
-Patch7:		smeserver-openvpn-bridge-2.0-check_certs.patch
-Patch8:		smeserver-openvpn-bridge-2.0-check_bridge.patch
-Patch9:		smeserver-openvpn-bridge-2.0-configure_crl_url.patch
-Patch10:	smeserver-openvpn-bridge-2.0-check_certs.patch2
-Patch11:	smeserver-openvpn-bridge-2.0-create_openvpn_db.patch
-Patch12:	smeserver-openvpn-bridge-2.0-local_fr_1.patch
-Patch13:	smeserver-openvpn-bridge-2.0-fixtranslation.patch
-Patch14:	smeserver-openvpn-bridge-2.0-removedups.patch
-Patch15:	smeserver-openvpn-bridge-2.0-fixlangtag.patch
-Patch16:	smeserver-openvpn-bridge-2.0-fix-en-us-locale.patch
-Patch17:	smeserver-openvpn-bridge-2.0-fix-en-us-locale2.patch
+Patch0: smeserver-openvpn-bridge-2.0-remove_dup_migrate.patch
+Patch1: smeserver-openvpn-bridge-2.0-pull.patch
+Patch2: smeserver-openvpn-bridge-2.0-config_required.patch
+Patch3: smeserver-openvpn-bridge-2.0-config_cleanup.patch
+Patch4: smeserver-openvpn-bridge-2.0-add_rule.patch
+Patch5: smeserver-openvpn-bridge-2.0-locale1.patch
+#atch6: smeserver-openvpn-bridge-2.0-openvpn_db.patch
+Patch7: smeserver-openvpn-bridge-2.0-check_certs.patch
+Patch8: smeserver-openvpn-bridge-2.0-check_bridge.patch
+Patch9: smeserver-openvpn-bridge-2.0-configure_crl_url.patch
+Patch10: smeserver-openvpn-bridge-2.0-check_certs.patch2
+Patch11: smeserver-openvpn-bridge-2.0-create_openvpn_db.patch
+Patch12: smeserver-openvpn-bridge-2.0-local_fr_1.patch
+Patch13: smeserver-openvpn-bridge-2.0-fixtranslation.patch
+Patch14: smeserver-openvpn-bridge-2.0-removedups.patch
+Patch15: smeserver-openvpn-bridge-2.0-fixlangtag.patch
+Patch16: smeserver-openvpn-bridge-2.0-fix-en-us-locale.patch
+Patch17: smeserver-openvpn-bridge-2.0-fix-en-us-locale2.patch
+Patch18: smeserver-openvpn-bridge-2.0-fix-en-us-locale2.patch
 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
@@ -40,8 +41,8 @@ BuildRequires: e-smith-devtools
 Requires: e-smith-base
 Requires: openvpn
 Requires: perl(Net::OpenVPN::Manage)
-Obsoletes:	smeserver-openvpn-bridge-fws
-Obsoletes:	smeserver-openvpn-bridge.fws
+Obsoletes: smeserver-openvpn-bridge-fws
+Obsoletes: smeserver-openvpn-bridge.fws
 
 %description
 This package contains all the needed scripts and templates
@@ -50,6 +51,10 @@ The panel of the server manager has a ce
 won't have to generate them manually
 
 %changelog
+* Tue Mar 03 2009 Jonathan Martens <smeserver-contribs@snetram.nl> [2.0-15]
+- Fix some more errors in the en-us locale
+- Remove tabs from SPEC file as some editors act weird with them, e.g. nano
+
 * Tue Mar 03 2009 Jonathan Martens <smeserver-contribs@snetram.nl> [2.0-14]
 - Fix some grammar errors in the en-us locale
 
@@ -153,6 +158,7 @@ won't have to generate them manually
 %patch15 -p1
 %patch16 -p1
 %patch17 -p1
+%patch17 -p1
 
 %build
 perl createlinks
@@ -167,11 +173,11 @@ perl createlinks
 (cd root   ; /usr/bin/find . -depth -print | /bin/cpio -dump $RPM_BUILD_ROOT)
 /bin/rm -f %{name}-%{version}-filelist
 /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
-	--file /var/service/openvpn-bridge/run 'attr(0755,root,root)' \
-	--file /var/service/openvpn-bridge/log/run 'attr(0755,root,root)' \
-	--dir /var/log/openvpn-bridge	'attr(0750,smelog,smelog)' \
-	--file /usr/bin/ovpn-bridge-update-crl  'attr(0750,root,root)' \
-	> %{name}-%{version}-filelist
+  --file /var/service/openvpn-bridge/run 'attr(0755,root,root)' \
+  --file /var/service/openvpn-bridge/log/run 'attr(0755,root,root)' \
+  --dir /var/log/openvpn-bridge 'attr(0750,smelog,smelog)' \
+  --file /usr/bin/ovpn-bridge-update-crl  'attr(0750,root,root)' \
+  > %{name}-%{version}-filelist
 
 %files -f %{name}-%{version}-filelist
 %defattr(-,root,root)
@@ -184,9 +190,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %preun
 if [ $1 -eq 0 ] ; then
-	/sbin/e-smith/db configuration setprop openvpn-bridge status disabled
-	sv d /service/openvpn-bridge
+ /sbin/e-smith/db configuration setprop openvpn-bridge status disabled
+ sv d /service/openvpn-bridge
 fi
 
 true
-