averi pushed to mirrorbrain (master). "Build and install HTML docs instead of doc sources, mark licenses as %license (..more)"

[notifications at fedoraproject.org]

From 4629d11a8905f0de197124477ec2422e73475aaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta at iki.fi>
Date: Sun, 17 May 2015 13:32:21 +0300
Subject: Build and install HTML docs instead of doc sources, mark licenses as
 %license

Signed-off-by: Andrea Veri <av at gnome.org>

diff --git a/mirrorbrain.spec b/mirrorbrain.spec
index e94eb81..453af2b 100644
--- a/mirrorbrain.spec
+++ b/mirrorbrain.spec
@@ -17,7 +17,7 @@ Name:		mirrorbrain
 Summary:	A download redirector and metalink generator
 Url:		http://mirrorbrain.org/
 Version:	2.18.1
-Release:	4%{?dist}
+Release:	5%{?dist}
 # ASL licensed files are: mod_autoindex_mb.c, mod_mirrorbrain.c, null-rsync
 # Other files are licensed under the GPLv2
 License:	ASL 2.0 and GPLv2
@@ -32,6 +32,7 @@ BuildRequires:	geoip
 BuildRequires:	geoip-devel
 BuildRequires:	mod_form
 BuildRequires:	python2-devel
+BuildRequires:	python-sphinx
 
 %description
 This apache module redirects clients to mirror servers, using an SQL backend,
@@ -165,6 +166,8 @@ gcc %{optflags} -Wall -o geoiplookup_city geoiplookup_city.c -lGeoIP
 cd ../mb
 CFLAGS="%{optflags}" \
 %{__python2} setup.py build
+cd ../docs
+make %{?_smp_mflags} html && rm _build/html/.buildinfo
 
 
 %install
@@ -205,13 +208,14 @@ getent passwd %{mirrorbrain_user} >/dev/null || useradd -r -g %{mirrorbrain_grou
 exit 0
 
 %files
-%doc COPYING FAQ TODO 
-%doc mod_autoindex_mb/NOTICE
+%{!?_licensedir:%global license %%doc}
+%license COPYING mod_autoindex_mb/NOTICE
+%doc FAQ TODO
 %doc mod_mirrorbrain/*.conf
 %dir %attr(750,%{mirrorbrain_user},%{mirrorbrain_group}) %{_localstatedir}/log/mirrorbrain
 
 %files doc
-%doc docs
+%doc docs/_build/html
 %doc sql
 
 %files -n mod_mirrorbrain
@@ -241,6 +245,9 @@ exit 0
 %{_bindir}/scanner
 
 %changelog
+* Sun May 17 2015 Ville Skyttä <ville.skytta at iki.fi> - 2.18.1-5
+- Build and install HTML docs instead of doc sources, mark licenses as %%license
+
 * Wed Aug 27 2014 Jitka Plesnikova <jplesnik at redhat.com> - 2.18.1-4
 - Perl 5.20 rebuild
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/mirrorbrain.git/commit/?h=master&id=4629d11a8905f0de197124477ec2422e73475aaa