Accepting request 460234 from devel:languages:python:singlespec

- change to build only with python3 Sphinx
- provide $flavor-doc for all pythons
- include patches so that build doesn't fail
  on manpages

- update for singlespec

OBS-URL: https://build.opensuse.org/request/show/460234
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pbr?expand=0&rev=58

python-pbr-doc.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Feb 23 15:22:44 UTC 2017 - jmatejek@suse.com
+
+- change to build only with python3 Sphinx
+- provide $flavor-doc for all pythons
+- include patches so that build doesn't fail
+  on manpages
+
 -------------------------------------------------------------------
 Tue May 24 05:15:23 UTC 2016 - tbechtold@suse.com
 

python-pbr-doc.spec

@@ -16,6 +16,7 @@
 #
 
 
+%{?!python_module:%define python_module() python-%{**} python3-%{**}}
 Name:           python-pbr-doc
 Version:        1.10.0
 Release:        0
@@ -25,27 +26,29 @@ Group:          Development/Languages/Python
 Url:            http://pypi.python.org/pypi/pbr
 Source:         https://pypi.python.org/packages/c3/2c/63275fab26a0fd8cadafca71a3623e4d0f0ee8ed7124a5bb128853d178a7/pbr-%{version}.tar.gz
 Source1:        python-pbr-rpmlintrc
+Patch0:         0001-Don-t-ignore-data-files.patch
+Patch1:         0001-Don-t-raise-exception-on-missing-man-pages.patch
 BuildRequires:  fdupes
-BuildRequires:  python-devel
 # Documentation requirements:
-BuildRequires:  python-Sphinx >= 1.1.2
+BuildRequires:  python3-Sphinx >= 1.1.2
+BuildRequires:  python3-setuptools
 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
+Provides:       %{python_module pbr-doc = %{version}}
 
 %description
 This package contains documentation files for python-pbr
 
 %prep
 %setup -q -n pbr-%{version}
+%patch0 -p1
+%patch1 -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
+python3 setup.py build_sphinx
+rm doc/build/html/.buildinfo
 
 %install
 mkdir -p %{buildroot}%{_docdir}/python-pbr

python-pbr.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Feb 21 14:11:09 UTC 2017 - jmatejek@suse.com
+
+- update for singlespec
+
 -------------------------------------------------------------------
 Mon Feb 20 22:03:16 UTC 2017 - dmueller@suse.com
 

python-pbr.spec

@@ -20,6 +20,7 @@
 # enable testing with a build conditional (off by default):
 %bcond_with test
 
+%{?!python_module:%define python_module() python-%{**} python3-%{**}}
 Name:           python-pbr
 Version:        1.10.0
 Release:        0
@@ -31,34 +32,30 @@ Source:         https://pypi.python.org/packages/c3/2c/63275fab26a0fd8cadafca71a
 Source1:        python-pbr-rpmlintrc
 Patch0:         0001-Don-t-ignore-data-files.patch
 Patch1:         0001-Don-t-raise-exception-on-missing-man-pages.patch
+BuildRequires:  %{python_module devel}
+BuildRequires:  %{python_module pip >= 1.4}
 BuildRequires:  fdupes
-BuildRequires:  python-devel
+BuildRequires:  python-rpm-macros
-BuildRequires:  python-pip >= 1.4
 # Test requirements:
 %if %{with test}
 #BuildRequires:  python-coverage >= 3.6
-%if 0%{?suse_version} <= 1110
+BuildRequires:  %{python_module fixtures >= 1.3.1}
-BuildRequires:  python-discover
+BuildRequires:  %{python_module hacking >= 0.9.2}
-%endif
+BuildRequires:  %{python_module mock >= 1.2}
-BuildRequires:  python-fixtures >= 1.3.1
+BuildRequires:  %{python_module python-subunit >= 0.0.18}
-BuildRequires:  python-hacking >= 0.9.2
+BuildRequires:  %{python_module six >= 1.9.0}
-BuildRequires:  python-mock >= 1.2
+BuildRequires:  %{python_module testrepository >= 0.0.18}
-BuildRequires:  python-python-subunit >= 0.0.18
+BuildRequires:  %{python_module testresources >= 0.2.4}
-BuildRequires:  python-six >= 1.9.0
+BuildRequires:  %{python_module testscenarios >= 0.4}
-BuildRequires:  python-testrepository >= 0.0.18
+BuildRequires:  %{python_module testtools >= 1.4.0}
-BuildRequires:  python-testresources >= 0.2.4
-BuildRequires:  python-testscenarios >= 0.4
-BuildRequires:  python-testtools >= 1.4.0
 %endif
 Requires:       python-setuptools
 Requires(post): update-alternatives
 Requires(postun): update-alternatives
 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
+
+%python_subpackages
 
 %description
 PBR is a library to automatically do a bunch of standard
@@ -67,6 +64,7 @@ them every time. It will set versions, process requirements
 files and generate AUTHORS and ChangeLog file all from git
 information.
 
+
 %prep
 %setup -q -n pbr-%{version}
 %patch0 -p1
@@ -75,38 +73,32 @@ information.
 sed -i "s/, 'sphinx\.ext\.intersphinx'//" doc/source/conf.py
 
 %build
-python setup.py build
+%python_build
 
 %install
-python setup.py install --prefix=%{_prefix} --root=%{buildroot}
+%{python_expand %$python_install
-mkdir -p %{buildroot}%{_sysconfdir}/alternatives
+mv %{buildroot}%{_bindir}/pbr %{buildroot}%{_bindir}/pbr-%{$python_bin_suffix}
-mv %{buildroot}%{_bindir}/pbr %{buildroot}%{_bindir}/pbr-%{py_ver}
+}
-ln -s -f %{_sysconfdir}/alternatives/pbr %{buildroot}%{_bindir}/pbr
+%prepare_alternative pbr
-# create a dummy target for /etc/alternatives/pbr
+%fdupes -s %{buildroot}%{_prefix}
-touch %{buildroot}%{_sysconfdir}/alternatives/pbr
-%fdupes -s %{buildroot}%{python_sitelib}
 
 %if %{with test}
 %check
-testr init && testr run --parallel
+%python_exec %{_bindir}/testr init
+%python_exec %{_bindir}/testr run --parallel
 %endif
 
 %post
-%_sbindir/update-alternatives \
+%python_install_alternative pbr
-    --install %{_bindir}/pbr pbr %{_bindir}/pbr-%{py_ver} 20
 
 %preun
-if [ $1 -eq 0 ] ; then
+%python_uninstall_alternative pbr
-    %_sbindir/update-alternatives --remove pbr %{_bindir}/pbr-%{py_ver}
-fi
 
-%files
+%files %{python_files}
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog CONTRIBUTING.rst LICENSE README.rst
+%python_alternative %{_bindir}/pbr
 %{python_sitelib}/pbr
-%{python_sitelib}/pbr-%{version}-py%{py_ver}.egg-info
+%{python_sitelib}/pbr-%{version}-py%{python_version}.egg-info
-%{_bindir}/pbr-%{py_ver}
-%{_bindir}/pbr
-%ghost %{_sysconfdir}/alternatives/pbr
 
 %changelog