[chocolate-doom] Install docs into %pkgdocdir.

corsepiu corsepiu at fedoraproject.org
Tue Dec 31 06:00:18 UTC 2013


commit 9eb93bf8f702421eeb859bc57e8b009e3c210389
Author: Ralf Corsépius <corsepiu at fedoraproject.org>
Date:   Tue Dec 31 07:00:07 2013 +0100

    Install docs into %pkgdocdir.
    
    - BR: %{__python} (Address FTBFS RHBZ #992055).

 chocolate-doom.spec |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/chocolate-doom.spec b/chocolate-doom.spec
index 9011648..c230e82 100644
--- a/chocolate-doom.spec
+++ b/chocolate-doom.spec
@@ -1,6 +1,6 @@
 Name:		chocolate-doom
 Version:	1.6.0
-Release:	6%{?dist}
+Release:	7%{?dist}
 Group:		Amusements/Games
 Summary:	Historically compatible Doom engine
 License:	GPLv2+
@@ -8,6 +8,8 @@ URL:		http://chocolate-doom.org/
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 BuildRequires:	SDL-devel, SDL_mixer-devel, SDL_net-devel
 BuildRequires:	libsamplerate-devel desktop-file-utils
+# Required by man/docgen
+BuildRequires:	%{__python}
 Provides:	bundled(md5-plumb)
 
 %description
@@ -23,12 +25,12 @@ was played in the 1990s.
 
 %build
 %configure
-make %{?_smp_mflags};
+make %{?_smp_mflags}
 
 %install
 make install DESTDIR=%{buildroot} \
      iconsdir="%{_datadir}/icons/hicolor/64x64/apps" \
-     docdir="%{_docdir}/%{name}-%{version}";
+     docdir="%{_pkgdocdir}"
 mkdir -p %{buildroot}/%{_bindir}
 mv %{buildroot}/%{_prefix}/games/* %{buildroot}/%{_bindir}/
 
@@ -52,6 +54,10 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/chocolate-setup.desk
 %{_mandir}/man6/chocolate-setup.6.gz
 
 %changelog
+* Tue Dec 31 2013 Ralf Corsépius <corsepiu at fedoraproject.org> - 1.6.0-7
+- Install docs into %%pkgdocdir.
+- BR: %%{__python} (Address FTBFS RHBZ #992055).
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 


More information about the scm-commits mailing list