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

[notifications at fedoraproject.org]

From 3fc2df06fa0e9827831f011a49efe014f335be06 Mon Sep 17 00:00:00 2001
From: Andrea Veri <av at gnome.org>
Date: Wed, 20 May 2015 17:40:45 +0200
Subject: Build and install HTML docs instead of doc sources, mark licenses as
 %%license


diff --git a/mirrorbrain.spec b/mirrorbrain.spec
index d38bbed..21f84b9 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:	3%{?dist}
+Release:	4%{?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,7 +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
 mkdir -p %{buildroot}/%{apache_libexecdir}
@@ -205,13 +207,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 +244,9 @@ exit 0
 %{_bindir}/scanner
 
 %changelog
+* Sun May 17 2015 Ville Skyttä <ville.skytta at iki.fi> - 2.18.1-4
+- Build and install HTML docs instead of doc sources, mark licenses as %%license
+
 * Sun Aug 17 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.18.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/mirrorbrain.git/commit/?h=f21&id=3fc2df06fa0e9827831f011a49efe014f335be06