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>

diff --git a/Makefile.am b/Makefile.am
index ab3e3d2e6336c8fec7996b697520fc81831110b4..7579f7281a3ffc17df4512e097cfe61eed9b541d 100644 (file)
--- 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 3d2276495c21f79134db34b2c070c857f9abcc30..3c316bfb8831cfc22e58c06fa9a42b9a860544e5 100644 (file)
--- 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}/*