Accepting request 320131 from devel:languages:python

Split documentation into own package to avoid dependency loop

OBS-URL: https://build.opensuse.org/request/show/320131
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-pbr?expand=0&rev=19

python-pbr-doc.changes

@@ -0,0 +1,4 @@
+-------------------------------------------------------------------
+Mon Aug  3 09:46:34 UTC 2015 - toddrme2178@gmail.com
+
+- Split documentation into own package to avoid dependency loop

python-pbr-doc.spec

@@ -0,0 +1,63 @@
+#
+# spec file for package python-pbr-doc
+#
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
+
+
+Name:           python-pbr-doc
+Version:        1.3.0
+Release:        0
+Summary:        Documentation for python-pbr
+License:        Apache-2.0
+Group:          Development/Languages/Python
+Url:            http://pypi.python.org/pypi/pbr
+Source:         https://pypi.python.org/packages/source/p/pbr/pbr-%{version}.tar.gz
+Source1:        python-pbr-rpmlintrc
+# NOTE(toabctl): this is currently in review: https://review.openstack.org/#/c/193462/
+# needed to be abe to use pbr with newer Sphinx versions
+Patch0:         0001-Remove-sphinx_config.init_values-manual-call.patch
+BuildRequires:  fdupes
+BuildRequires:  python-devel
+# Documentation requirements:
+BuildRequires:  python-Sphinx >= 1.1.2
+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
+This package contains documentation files for python-pbr
+
+%prep
+%setup -q -n pbr-%{version}
+%patch0 -p1
+# Get rid of ugly build-time deps that require network:
+sed -i "s/, 'sphinx\.ext\.intersphinx'//" doc/source/conf.py
+
+%build
+python setup.py build_sphinx && rm doc/build/html/.buildinfo
+
+%install
+mkdir -p %{buildroot}%{_docdir}/python-pbr
+cp -r doc/build/html %{buildroot}%{_docdir}/python-pbr/
+
+%files
+%defattr(-,root,root,-)
+%doc LICENSE
+%{_docdir}/python-pbr/
+
+%changelog

python-pbr.changes

@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Mon Aug  3 10:04:09 UTC 2015 - toddrme2178@gmail.com
+
+- Actually remove documentation requirements
+
+-------------------------------------------------------------------
+Mon Aug  3 09:46:34 UTC 2015 - toddrme2178@gmail.com
+
+- Split documentation into own package to avoid dependency loop
+
+-------------------------------------------------------------------
+Mon Jul 27 15:37:32 UTC 2015 - toddrme2178@gmail.com
+
+- Fix update-alternatives usage.
+
 -------------------------------------------------------------------
 Fri Jul 17 11:54:48 UTC 2015 - tbechtold@suse.com
 

python-pbr.spec

@@ -35,8 +35,6 @@ Patch0:         0001-Remove-sphinx_config.init_values-manual-call.patch
 BuildRequires:  fdupes
 BuildRequires:  python-devel
 BuildRequires:  python-pip >= 1.4
-# Documentation requirements:
-BuildRequires:  python-Sphinx >= 1.1.2
 # Test requirements:
 %if %{with test}
 #BuildRequires:  python-coverage >= 3.6
@@ -69,14 +67,6 @@ them every time. It will set versions, process requirements
 files and generate AUTHORS and ChangeLog file all from git
 information.
 
-%package doc
-Summary:        Python Build Reasonableness documentation
-Group:          Development/Languages/Python
-Requires:       %{name} = %{version}
-
-%description doc
-This package contains documentation files for %{name}.
-
 %prep
 %setup -q -n pbr-%{version}
 %patch0 -p1
@@ -85,14 +75,14 @@ sed -i "s/, 'sphinx\.ext\.intersphinx'//" doc/source/conf.py
 
 %build
 python setup.py build
-python setup.py build_sphinx && rm doc/build/html/.buildinfo
 
 %install
 python setup.py install --prefix=%{_prefix} --root=%{buildroot}
 mkdir -p %{buildroot}%{_sysconfdir}/alternatives
 mv %{buildroot}%{_bindir}/pbr %{buildroot}%{_bindir}/pbr-%{py_ver}
-ln -s %{_bindir}/pbr-%{py_ver} %{buildroot}%{_bindir}/pbr
+ln -s -f %{_sysconfdir}/alternatives/pbr %{buildroot}%{_bindir}/pbr
-ln -s %{_bindir}/pbr-%{py_ver} %{buildroot}%{_sysconfdir}/alternatives/pbr
+# create a dummy target for /etc/alternatives/pbr
+touch %{buildroot}%{_sysconfdir}/alternatives/pbr
 %fdupes -s %{buildroot}%{python_sitelib}
 
 %if %{with test}
@@ -115,11 +105,7 @@ fi
 %{python_sitelib}/pbr
 %{python_sitelib}/pbr-%{version}-py%{py_ver}.egg-info
 %{_bindir}/pbr-%{py_ver}
-%ghost %{_bindir}/pbr
+%{_bindir}/pbr
 %ghost %{_sysconfdir}/alternatives/pbr
 
-%files doc
-%defattr(-,root,root,-)
-%doc doc/build/html
-
 %changelog