diff options
author | Alon Bar-Lev | 2012-05-12 22:03:53 +0300 |
---|---|---|
committer | David Sommerseth | 2012-06-01 13:47:05 +0200 |
commit | 46977f29077521802f0cb6ab3cd4c894b9d4f5f6 (patch) | |
tree | f5ad535671b9cf35d8cbb361a1a936f2573fc8a9 | |
parent | 03d9cb1ec6432ce218dbff5e0675cd5250a40ca3 (diff) | |
download | openvpn-46977f29077521802f0cb6ab3cd4c894b9d4f5f6.zip openvpn-46977f29077521802f0cb6ab3cd4c894b9d4f5f6.tar.gz |
build: insall README* document using build system
Purpose: make distro packager task simpler, more flexible to provide
more documentation without changing the packaging script.
Remove installation related documents from rpm as package already
installed when viewed.
+Workaround rpm bug[1].
[1] http://rpm.org/ticket/836
Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
Acked-by: David Sommerseth <davids@redhat.com>
Message-Id: 1336849433-23066-1-git-send-email-alon.barlev@gmail.com
URL: http://article.gmane.org/gmane.network.openvpn.devel/6536
Signed-off-by: David Sommerseth <davids@redhat.com>
-rw-r--r-- | Makefile.am | 3 | ||||
-rw-r--r-- | distro/rpm/openvpn.spec.in | 11 |
2 files changed, 10 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index ab3e3d2..7579f72 100644 --- a/Makefile.am +++ b/Makefile.am @@ -47,6 +47,9 @@ EXTRA_DIST = \ SUBDIRS = build distro include src sample doc tests dist_doc_DATA = \ + README \ + README.IPv6 \ + README.polarssl \ COPYRIGHT.GPL \ COPYING diff --git a/distro/rpm/openvpn.spec.in b/distro/rpm/openvpn.spec.in index 3d22764..3c316bf 100644 --- a/distro/rpm/openvpn.spec.in +++ b/distro/rpm/openvpn.spec.in @@ -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}/* |