[packages/chocolate-doom: 2/2] fix doc install

glen glen at pld-linux.org
Thu Mar 17 22:13:05 CET 2016


commit c87a608a443a57f0317973ec339d6beca44b1fb1
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Thu Mar 17 23:12:48 2016 +0200

    fix doc install

 chocolate-doom.spec | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)
---
diff --git a/chocolate-doom.spec b/chocolate-doom.spec
index af8f30f..d1598e4 100644
--- a/chocolate-doom.spec
+++ b/chocolate-doom.spec
@@ -1,7 +1,7 @@
 Summary:	Historically compatible Doom engine
 Name:		chocolate-doom
 Version:	2.2.0
-Release:	0.1
+Release:	1
 License:	GPL v2+
 Group:		Applications/Games
 Source0:	http://www.chocolate-doom.org/downloads/%{version}/%{name}-%{version}.tar.gz
@@ -38,9 +38,12 @@ the 1990s.
 rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	iconsdir=%{_iconsdir}/hicolor/64x64/apps \
-	docdir=%{_docdir} \
 	DESTDIR=$RPM_BUILD_ROOT
 
+rm -rf docs
+install -d docs
+mv $RPM_BUILD_ROOT/usr/share/doc/chocolate-{doom,heretic,hexen,strife} docs
+
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/appdata}
 mv $RPM_BUILD_ROOT%{_prefix}/games/* $RPM_BUILD_ROOT%{_bindir}
 
@@ -56,11 +59,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc ChangeLog NEWS NOT-BUGS README
-%if 0
-%doc %{_docdir}/chocolate-heretic
-%doc %{_docdir}/chocolate-hexen
-%doc %{_docdir}/chocolate-strife
-%endif
+%doc docs/*
 %attr(755,root,root) %{_bindir}/chocolate-doom
 %attr(755,root,root) %{_bindir}/chocolate-server
 %attr(755,root,root) %{_bindir}/chocolate-doom-setup
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/chocolate-doom.git/commitdiff/c87a608a443a57f0317973ec339d6beca44b1fb1



More information about the pld-cvs-commit mailing list