[blobwars] Install docs to %{_pkgdocdir} where available (#993685).

Ville Skyttä scop at fedoraproject.org
Thu Dec 12 22:17:04 UTC 2013


commit bf57aca40ba85f3b1b68919148b1c1bde5266583
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Fri Dec 13 00:17:04 2013 +0200

    Install docs to %{_pkgdocdir} where available (#993685).

 blobwars.spec |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/blobwars.spec b/blobwars.spec
index b478774..d78d949 100644
--- a/blobwars.spec
+++ b/blobwars.spec
@@ -1,6 +1,8 @@
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
+
 Name:           blobwars
 Version:        1.19
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Mission and Objective based 2D Platform Game
 Group:          Amusements/Games
 # Code and gfx is all GPLv2+. Music is all CC-BY-SA. SFX are a mix, see readme
@@ -25,15 +27,13 @@ MIAs as possible.
 %patch1 -p1
 
 %build
-make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" RELEASE=1 \
-  DOCDIR=%{_docdir}/%{name}-%{version}/
+make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" RELEASE=1 DOCDIR=%{_pkgdocdir}/
 
 %install
-%make_install
+%make_install DOCDIR=%{_pkgdocdir}/
 %find_lang %{name}
 desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
-rm -r $RPM_BUILD_ROOT%{_docdir}/%{name}
 
 rm $RPM_BUILD_ROOT%{_datadir}/%{name}/data/vera.ttf
 ln -s %{_datadir}/fonts/bitstream-vera/Vera.ttf \
@@ -52,13 +52,16 @@ fi
 gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %files -f %{name}.lang
-%doc doc/*
+%{_pkgdocdir}
 %{_bindir}/%{name}
 %{_datadir}/%{name}
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/*/apps/%{name}.png
 
 %changelog
+* Thu Dec 12 2013 Ville Skyttä <ville.skytta at iki.fi> - 1.19-7
+- Install docs to %%{_pkgdocdir} where available (#993685).
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.19-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 


More information about the scm-commits mailing list