summaryrefslogtreecommitdiff
path: root/openvpn/distro
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2012-06-02 15:45:11 +0200
committerArne Schwabe <arne@rfc2549.org>2012-06-02 15:45:11 +0200
commitec2008e9e53b99ba1725d8398e21b9cb04f6b8ca (patch)
tree8498bf1722b27ae47a5cec27c7f6cf5ecb868bb3 /openvpn/distro
parentb84e3939a015b42c316af0b63297932e6fcf8ba4 (diff)
bring openvpn in sync with openvpn git master and patches submitted to mailing list
Diffstat (limited to 'openvpn/distro')
-rw-r--r--openvpn/distro/rpm/openvpn.spec.in45
1 files changed, 24 insertions, 21 deletions
diff --git a/openvpn/distro/rpm/openvpn.spec.in b/openvpn/distro/rpm/openvpn.spec.in
index d9158c15..3c316bfb 100644
--- a/openvpn/distro/rpm/openvpn.spec.in
+++ b/openvpn/distro/rpm/openvpn.spec.in
@@ -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.7
+Requires: openssl >= 0.9.7
%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
@@ -164,6 +164,10 @@ done
%__mv -f src/plugins/README src/plugins/README.plugins
+# Install extra %doc stuff
+cp -r AUTHORS ChangeLog NEWS contrib/ sample/ src/plugins/README.* \
+ "%{buildroot}/%{_docdir}/%{name}-%{version}"
+
#
# Clean section
#
@@ -207,13 +211,15 @@ fi
#
# Files section
#
+# don't use %doc as old rpmbuild removes it[1].
+# [1] http://rpm.org/ticket/836
%files
%defattr(-,root,root)
-%doc AUTHORS ChangeLog COPYING COPYRIGHT.GPL INSTALL NEWS PORTS README
%{_mandir}
%{_sbindir}/%{name}
%{_datadir}/%{name}
+%{_docdir}/%{name}-%{version}
%dir /etc/%{name}
%if "%{VENDOR}" == "SuSE"
/etc/init.d/%{name}
@@ -221,9 +227,6 @@ fi
/etc/rc.d/init.d/%{name}
%endif
-# Install extra %doc stuff
-%doc contrib/ sample/ src/plugins/README.*
-
%files devel
%defattr(-,root,root)
%{_includedir}/*