cleanup: spec: make space/tab consistent
PATCH 1/2 cleanup: spec: make space/tab consistent
Signed-off-by Alon Bar-Lev <[email protected]...>
--- distro/rpm/openvpn.spec.in | 34 +++++++++++++++++----------------- 1 files changed, 17 insertions(+), 17 deletions(-)
distro/rpm/openvpn.spec.in +17 -17
@@ -12,8 +12,8 @@ # rpmbuild -tb [openvpn.x.tar.gz] --define 'with_password_save 1' Summary: OpenVPN is a robust and highly flexible VPN daemon by James Yonan. -Name: @PACKAGE@ -Version: @VERSION@ +Name: @PACKAGE@ +Version: @VERSION@ Release: 1 URL: http://openvpn.net/ Source0: http://prdownloads.sourceforge.net/openvpn/%{name}-%{version}.tar.gz
@@ -30,27 +30,27 @@ BuildRoot: %{_tmppath}/%{name}-%(id -un) AutoReq: 0 -BuildRequires: openssl-devel >= 0.9.6 -Requires: openssl >= 0.9.6 +BuildRequires: openssl-devel >= 0.9.6 +Requires: openssl >= 0.9.6 %if "%{_vendor}" == "Mandrakesoft" -%{!?without_lzo:BuildRequires: liblzo1-devel >= 1.07} -%{!?without_lzo:Requires: liblzo1 >= 1.07} +%{!?without_lzo:BuildRequires: liblzo1-devel >= 1.07} +%{!?without_lzo:Requires: liblzo1 >= 1.07} %else %if "%{_vendor}" == "MandrakeSoft" -%{!?without_lzo:BuildRequires: liblzo1-devel >= 1.07} -%{!?without_lzo:Requires: liblzo1 >= 1.07} +%{!?without_lzo:BuildRequires: liblzo1-devel >= 1.07} +%{!?without_lzo:Requires: liblzo1 >= 1.07} %else -%{!?without_lzo:BuildRequires: lzo-devel >= 1.07} -%{!?without_lzo:Requires: lzo >= 1.07} +%{!?without_lzo:BuildRequires: lzo-devel >= 1.07} +%{!?without_lzo:Requires: lzo >= 1.07} %endif %endif -%{!?without_pam:BuildRequires: pam-devel} -%{!?without_pam:Requires: pam} +%{!?without_pam:BuildRequires: pam-devel} +%{!?without_pam:Requires: pam} -%{?with_pkcs11:BuildRequires: pkcs11-helper-devel} -%{?with_pkcs11:Requires: pkcs11-helper} +%{?with_pkcs11:BuildRequires: pkcs11-helper-devel} +%{?with_pkcs11:Requires: pkcs11-helper} # # Description
@@ -68,7 +68,7 @@ and portability to most major OS platforms. %package devel Summary: OpenVPN is a robust and highly flexible VPN daemon by James Yonan. Group: Applications/Internet -Requires: %{name} +Requires: %{name} %description devel Development support for OpenVPN.
@@ -134,10 +134,10 @@ popd # Install init script %if "%{VENDOR}" == "SuSE" %__install -c -d -m 755 "%{buildroot}/etc/init.d" -%__install -c -m 755 "distro/rpm/%{name}.init.d.suse" "%{buildroot}/etc/init.d/%{name}" +%__install -c -m 755 "distro/rpm/%{name}.init.d.suse" "%{buildroot}/etc/init.d/%{name}" %else %__install -c -d -m 755 "%{buildroot}/etc/rc.d/init.d" -%__install -c -m 755 distro/rpm/%{name}.init.d.rhel "%{buildroot}/etc/rc.d/init.d/%{name}" +%__install -c -m 755 distro/rpm/%{name}.init.d.rhel "%{buildroot}/etc/rc.d/init.d/%{name}" %endif # Install /etc/openvpn
Signature · 1 line
1.7.3.4
PATCH 2/2 build: spec: we support openssl >= 0.9.7
Signed-off-by Alon Bar-Lev <[email protected]...>
--- distro/rpm/openvpn.spec.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
distro/rpm/openvpn.spec.in +2 -2
@@ -30,8 +30,8 @@ BuildRoot: %{_tmppath}/%{name}-%(id -un) AutoReq: 0 -BuildRequires: openssl-devel >= 0.9.6 -Requires: openssl >= 0.9.6 +BuildRequires: openssl-devel >= 0.9.7 +Requires: openssl >= 0.9.7 %if "%{_vendor}" == "Mandrakesoft" %{!?without_lzo:BuildRequires: liblzo1-devel >= 1.07}
Signature · 1 line
1.7.3.4
Quoted 5 lines · Alon Bar-Lev
Signed-off-by Alon Bar-Lev <[email protected]...> ---distro/rpm/openvpn.spec.in | 34
+++++++++++++++++----------------- 1 files changed, 17 insertions(+), 17 deletions(-)
Both patches applied to master.
commit 03d9cb1ec6432ce218dbff5e0675cd5250a40ca3
Author: Alon Bar-Lev <[email protected]...> Date: Tue May 15 01:29:40 2012 +0300
build: spec: we support openssl >= 0.9.7
Signed-off-by: Alon Bar-Lev <[email protected]...>
Acked-by: David Sommerseth <[email protected]...>
Message-Id: [email protected]...
URL: http://article.gmane.org/gmane.network.openvpn.devel/6589
Signed-off-by: David Sommerseth <[email protected]...>commit 893f27b164142fc285e39731846bbc237ceb62a9
Author: Alon Bar-Lev <[email protected]...> Date: Tue May 15 01:29:39 2012 +0300
cleanup: spec: make space/tab consistent
Signed-off-by: Alon Bar-Lev <[email protected]...>
Acked-by: David Sommerseth <[email protected]...>
Message-Id: [email protected]...
URL: http://article.gmane.org/gmane.network.openvpn.devel/6590
Signed-off-by: David Sommerseth <[email protected]...>kind regards,
David Sommerseth