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.bar...@gmail.com> --- Makefile.am | 3 +++ distro/rpm/openvpn.spec.in | 11 +++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index 33dfcd6..c580579 100644 --- a/Makefile.am +++ b/Makefile.am @@ -57,6 +57,9 @@ endif 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 d9158c1..a6f31bd 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}/* -- 1.7.3.4
