[packages/python-amqp] fix apidocs build

jajcus jajcus at pld-linux.org
Mon Nov 30 19:17:21 CET 2015


commit 8df16ed9ea864060d2f64e4da41c5b7261d4f1ad
Author: Jacek Konieczny <jajcus at jajcus.net>
Date:   Mon Nov 30 19:16:45 2015 +0100

    fix apidocs build
    
    Release: 4

 python-amqp.spec | 43 +++++++++++++++++++++++++++++++++++++------
 1 file changed, 37 insertions(+), 6 deletions(-)
---
diff --git a/python-amqp.spec b/python-amqp.spec
index 2ec1363..f95d464 100644
--- a/python-amqp.spec
+++ b/python-amqp.spec
@@ -10,7 +10,7 @@ Summary:	AMQP 0.9.1 client library
 Summary(pl.UTF-8):	Biblioteka kliencka AMQP 0.9.1
 Name:		python-%{module}
 Version:	1.4.7
-Release:	3
+Release:	4
 License:	LGPL v2.1
 Group:		Libraries/Python
 Source0:	https://pypi.python.org/packages/source/a/amqp/%{module}-%{version}.tar.gz
@@ -29,7 +29,7 @@ BuildRequires:	python-unittest2>=0.4.0
 %endif
 %if %{with doc}
 BuildRequires:	python-sphinxcontrib-issuetracker
-BuildRequires:	sphinx-pdg
+BuildRequires:	sphinx-pdg-2
 %endif
 %endif
 %if %{with python3}
@@ -40,6 +40,10 @@ BuildRequires:	python3-mock
 BuildRequires:	python3-nose
 BuildRequires:	python3-nose-cover3
 %endif
+%if %{with doc}
+BuildRequires:	python3-sphinxcontrib-issuetracker
+BuildRequires:	sphinx-pdg-3
+%endif
 %endif
 Requires:	python-modules
 BuildArch:	noarch
@@ -76,6 +80,17 @@ API documentation for %{module}.
 %description apidocs -l pl.UTF-8
 Dokumentacja API %{module}.
 
+%package -n python3-%{module}-apidocs
+Summary:	%{module} API documentation
+Summary(pl.UTF-8):	Dokumentacja API %{module}
+Group:		Documentation
+
+%description -n python3-%{module}-apidocs
+API documentation for %{module}.
+
+%description -n python3-%{module}-apidocs -l pl.UTF-8
+Dokumentacja API %{module}.
+
 %prep
 %setup -q -n %{module}-%{version}
 
@@ -85,14 +100,24 @@ Dokumentacja API %{module}.
 
 %if %{with doc}
 cd docs
-PYTHONPATH=../build-2/lib %{__make} -j1 html
+PYTHONPATH=../build-2/lib %{__make} -j1 html SPHINXBUILD=sphinx-build-2
 rm -rf .build/html/_sources
+mv .build .build2
 cd ..
 %endif
+
 %endif
 
 %if %{with python3}
 %py3_build %{?with_tests:test}
+
+%if %{with doc}
+cd docs
+PYTHONPATH=../build-3/lib %{__make} -j1 html SPHINXBUILD=sphinx-build-3
+rm -rf .build/html/_sources
+mv .build .build3
+cd ..
+%endif
 %endif
 
 %install
@@ -120,6 +145,12 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{py_sitescriptdir}/%{module}/tests
 %{py_sitescriptdir}/%{module}/tests/*.py[co]
 %{py_sitescriptdir}/%{module}-%{version}-py*.egg-info
+
+%if %{with doc}
+%files apidocs
+%defattr(644,root,root,755)
+%doc docs/.build2/html/*
+%endif
 %endif
 
 %if %{with python3}
@@ -128,10 +159,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc Changelog README.rst
 %{py3_sitescriptdir}/%{module}
 %{py3_sitescriptdir}/%{module}-%{version}-py*.egg-info
-%endif
 
 %if %{with doc}
-%files apidocs
+%files -n python3-%{module}-apidocs
 %defattr(644,root,root,755)
-%doc docs/.build/html/*
+%doc docs/.build3/html/*
+%endif
 %endif
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/python-amqp.git/commitdiff/8df16ed9ea864060d2f64e4da41c5b7261d4f1ad



More information about the pld-cvs-commit mailing list