--- rpms/smeserver-openvpn-bridge/contribs7/smeserver-openvpn-bridge.spec 2009/03/03 11:30:37 1.3 +++ 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.2 2009/03/02 23:53:30 slords Exp $ +# $Id: smeserver-openvpn-bridge.spec,v 1.10 2009/03/03 18:34:43 snetram Exp $ # Authority: vip-ire # Name: Daniel Berteaud @@ -6,34 +6,43 @@ Summary: OpenVPN, a strong VPN solution %define name smeserver-openvpn-bridge Name: %{name} %define version 2.0 -%define release 9 +%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 +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 + +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 @@ -42,8 +51,28 @@ The panel of the server manager has a ce won't have to generate them manually %changelog +* Tue Mar 03 2009 Jonathan Martens [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 [2.0-14] +- Fix some grammar errors in the en-us locale + +* Tue Mar 03 2009 Jonathan Martens [2.0-13] +- Fix a typo in the en-us locale + +* Tue Mar 03 2009 Shad L. Lords [2.0-12] +- Fix xml language tag to be correct + +* Tue Mar 03 2009 Shad L. Lords [2.0-11] +- Remove duplicate translations that break pootle + +* Tue Mar 03 2009 Shad L. Lords [2.0-10] +- Rename locale/en to locale/en-us to pootle works + * Tue Mar 03 2009 Daniel B. [2.0-9] - Apply locale patch fr 1 +- Add e-smith-devtools as a dependencie * Thu Jan 29 2009 Daniel B. [2.0-8] - Fix an error with the creation of the db @@ -124,6 +153,12 @@ won't have to generate them manually %patch10 -p1 %patch11 -p1 %patch12 -p1 +%patch13 -p1 +%patch14 -p1 +%patch15 -p1 +%patch16 -p1 +%patch17 -p1 +%patch17 -p1 %build perl createlinks @@ -138,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) @@ -155,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 -