summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.am3
-rw-r--r--distro/rpm/openvpn.spec.in11
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}/*