build: insall README* document using build system

PATCH Applied Alon Bar-Lev 2 participants 2 messages May 12, 2012 – Jun 1, 2012 Kbuild

Share & tools

Alon Bar-Lev

author

2012-05-12 19:03 UTC #0 lore raw

PATCH 1/1 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 <[email protected]...>

---
 Makefile.am                |    3 +++
 distro/rpm/openvpn.spec.in |   11 +++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

Makefile.am +3 -0

index 33dfcd6..c580579 100644
@@ -57,6 +57,9 @@ endif
 SUBDIRS = build distro include src sample doc tests
 
 dist_doc_DATA = \
+	README \
+	README.IPv6 \
+	README.polarssl \
 	COPYRIGHT.GPL \
 	COPYING

distro/rpm/openvpn.spec.in +7 -4

index d9158c1..a6f31bd 100644
@@ -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}/*

Signature · 1 line

1.7.3.4

David Sommerseth

Applied

2012-06-01 12:37 UTC #1 lore raw

Quoted 8 lines · Alon Bar-Lev

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].

Quoted 8 lines

[1] http://rpm.org/ticket/836
Signed-off-by Alon Bar-Lev <[email protected]...>
---
 Makefile.am                |    3 +++
 distro/rpm/openvpn.spec.in |   11 +++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

Applied to master branch.

commit 46977f29077521802f0cb6ab3cd4c894b9d4f5f6

Author: Alon Bar-Lev <[email protected]...>
Date:   Sat May 12 22:03:53 2012 +0300

    build: insall README* document using build system

    Signed-off-by: Alon Bar-Lev <[email protected]...>
    Acked-by: David Sommerseth <[email protected]...>
    Message-Id: [email protected]...
    URL: http://article.gmane.org/gmane.network.openvpn.devel/6536
    Signed-off-by: David Sommerseth <[email protected]...>

kind regards,

David Sommerseth