From 9ebe7167e6df25dcb9548f64e7566015097a78a570c26d82b9a714e8c46de570 Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Tue, 20 Nov 2012 11:26:17 +0000 Subject: [PATCH] - Build HTML documentation - Fix SLE_11_SP2 build (not noarch) - Build HTML documentation, but disable due to python3-Sphinx error - No need to require a specific Python ABI version, RPM does that OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pyudev?expand=0&rev=11 --- python-pyudev.changes | 6 ++++++ python-pyudev.spec | 29 +++++++++++++++++++++++------ python3-pyudev.changes | 6 ++++++ python3-pyudev.spec | 11 ++++++++--- 4 files changed, 43 insertions(+), 9 deletions(-) diff --git a/python-pyudev.changes b/python-pyudev.changes index cf17d10..02c4e81 100644 --- a/python-pyudev.changes +++ b/python-pyudev.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Nov 20 11:14:36 UTC 2012 - saschpe@suse.de + +- Build HTML documentation +- Fix SLE_11_SP2 build (not noarch) + ------------------------------------------------------------------- Sun Nov 18 19:40:16 UTC 2012 - asterios.dramis@gmail.com diff --git a/python-pyudev.spec b/python-pyudev.spec index addf9d0..932f96f 100644 --- a/python-pyudev.spec +++ b/python-pyudev.spec @@ -25,14 +25,23 @@ Group: Development/Libraries/Python Url: http://pyudev.readthedocs.org/ Source0: http://pypi.python.org/packages/source/p/pyudev/pyudev-%{version}.tar.gz BuildRequires: libudev-devel +BuildRequires: python-Sphinx BuildRequires: python-devel BuildRequires: python-distribute -%{py_requires} +# Testsuite BuildRequires: +BuildRequires: python-mock +BuildRequires: python-nose +BuildRequires: python-py +BuildRequires: python-pytest # pyudev was last used in KDE:Unstable:Playground (pyudev-0.8) Provides: pyudev = %{version} Obsoletes: pyudev < %{version} -BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if 0%{?suse_version} && 0%{?suse_version} <= 1110 +%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%else +BuildArch: noarch +%endif %description A Python binding to libudev, the hardware management library and service found @@ -40,16 +49,24 @@ in modern linux systems. %prep %setup -q -n pyudev-%{version} +# Disable intersphinx and issuetracker, we don't want to access the web during doc build: +sed -i -e "s|'sphinx.ext.intersphinx',\\?||" -e "s|'sphinxcontrib.issuetracker',\\?||" doc/conf.py %build python setup.py build +python setup.py build_sphinx +rm build/sphinx/html/.buildinfo %install -python setup.py install --prefix=%{_prefix} --root=%{buildroot} --record-rpm=INSTALLED_FILES +python setup.py install --prefix=%{_prefix} --root=%{buildroot} -%files -f INSTALLED_FILES +#TODO: fix +#%%check +#nosetests + +%files %defattr(-,root,root,-) -%doc CHANGES.rst COPYING README.rst -%doc doc/guide.rst doc/index.rst +%doc CHANGES.rst COPYING README.rst build/sphinx/html/ +%{python_sitelib}/* %changelog diff --git a/python3-pyudev.changes b/python3-pyudev.changes index cf17d10..12c7926 100644 --- a/python3-pyudev.changes +++ b/python3-pyudev.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Nov 20 11:15:39 UTC 2012 - saschpe@suse.de + +- Build HTML documentation, but disable due to python3-Sphinx error +- No need to require a specific Python ABI version, RPM does that + ------------------------------------------------------------------- Sun Nov 18 19:40:16 UTC 2012 - asterios.dramis@gmail.com diff --git a/python3-pyudev.spec b/python3-pyudev.spec index c25739c..af12ac7 100644 --- a/python3-pyudev.spec +++ b/python3-pyudev.spec @@ -25,9 +25,10 @@ Group: Development/Libraries/Python Url: http://pyudev.readthedocs.org/ Source0: http://pypi.python.org/packages/source/p/pyudev/pyudev-%{version}.tar.gz BuildRequires: libudev-devel +BuildRequires: python3-2to3 +BuildRequires: python3-Sphinx BuildRequires: python3-devel BuildRequires: python3-distribute -Requires: python(abi) = %{py3_ver} BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -37,17 +38,21 @@ in modern linux systems. %prep %setup -q -n pyudev-%{version} +# Disable intersphinx and issuetracker, we don't want to access the web during doc build: +sed -i -e "s|'sphinx.ext.intersphinx',\\?||" -e "s|'sphinxcontrib.issuetracker',\\?||" doc/conf.py %build python3 setup.py build +#python3 setup.py build_sphinx +#rm build/sphinx/html/.buildinfo %install python3 setup.py install --prefix=%{_prefix} --root=%{buildroot} %files %defattr(-,root,root,-) -%doc CHANGES.rst COPYING README.rst -%doc doc/guide.rst doc/index.rst +%doc CHANGES.rst COPYING README.rst +#build/sphinx/html/ %{python3_sitelib}/pyudev-*.egg-info/ %{python3_sitelib}/pyudev/