diff --git a/_multibuild b/_multibuild
new file mode 100644
index 0000000..fcc7b97
--- /dev/null
+++ b/_multibuild
@@ -0,0 +1,3 @@
+
+ test
+
diff --git a/for_sphinx.patch b/for_sphinx.patch
deleted file mode 100644
index 6f7c304..0000000
--- a/for_sphinx.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: pbr-4.0.3/setup.cfg
-===================================================================
---- pbr-4.0.3.orig/setup.cfg
-+++ pbr-4.0.3/setup.cfg
-@@ -55,7 +55,6 @@ console_scripts =
- all-files = 1
- build-dir = doc/build
- source-dir = doc/source
--warning-is-error = 1
-
- [wheel]
- universal = 1
diff --git a/pbr-4.0.3.tar.gz b/pbr-4.0.3.tar.gz
deleted file mode 100644
index ddd9db6..0000000
--- a/pbr-4.0.3.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6874feb22334a1e9a515193cba797664e940b763440c88115009ec323a7f2df5
-size 108684
diff --git a/pbr-4.1.1.tar.gz b/pbr-4.1.1.tar.gz
new file mode 100644
index 0000000..967d13d
--- /dev/null
+++ b/pbr-4.1.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:754e766b4f4bad3aa68cfd532456298da1aa39375da8748392dbae90860d5f18
+size 108683
diff --git a/python-pbr-doc.changes b/python-pbr-doc.changes
deleted file mode 100644
index 963b15c..0000000
--- a/python-pbr-doc.changes
+++ /dev/null
@@ -1,237 +0,0 @@
--------------------------------------------------------------------
-Fri May 25 09:48:46 UTC 2018 - mimi.vx@gmail.com
-
-- for_sphinx.patch - allow warnings for sphinx_build
- unfortuanetly python3 and python2 Sphinx have diff in docstring parsing
-
--------------------------------------------------------------------
-Wed May 23 02:48:49 UTC 2018 - arun@gmx.de
-
-- update to version 4.0.3:
- * Don't poke in pip for requests
- * Fix builddoc with sphinx <= 1.6
-
--------------------------------------------------------------------
-Mon Apr 23 15:14:47 UTC 2018 - arun@gmx.de
-
-- update to version 4.0.2:
- * Better Sem-Ver header handling
-
-- changes from version 4.0.1:
- * add lower-constraints job
- * Explicitly read setup.cfg as utf-8 on Python 3
-
--------------------------------------------------------------------
-Wed Mar 28 04:42:26 UTC 2018 - tbechtold@suse.com
-
-- update to 4.0.0:
- * builddoc: Treat '[pbr] autodoc\_tree\_excludes' as a multi-line opt
- * update parse test to use reliable comparison
- * Make docs on env vars a little clearer
- * Updated from global requirements
- * future-proof invocation of apidoc
- * emit warning correctly
- * deprecations: Deprecate support for '-py{N}' requirements
- * doc: Minor rework of usage doc
- * doc: Rework features doc
- * Support v version
- * Deprecate testr and nose integration
- * tests: Increase coverage of requirements parsing
- * trivial: Move packaging tests to test\_packaging
- * Put test-requirements into an extra named 'test'
- * Support Description-Content-Type metadata
- * Avoid tox\_install.sh for constraints support
- * Test on Python 3.6
- * Support PEP 345 Project-URL metadata
- * Remove setting of version/release from releasenotes
- * Use 'build\_reno' setuptools extension if available
- * Remove unnecessary 'if True'
- * Discover Distribution through the class hierarchy
- * Add reno for release notes management
- * Remove support for command hooks
- * Remove dead code
- * Deprecate support for Sphinx < 1.6
- * builddoc: Use '[sphinx\_build] builders' with Sphinx < 1.6
- * Remove win32/nt checks for wrapper script gen
- * Remove py26 support
- * Update URLs in documents according to document migration
- * gitignore: Ignore .venv
- * switch from oslosphinx to openstackdocstheme
- * Trivial: Fix docstring
- * turn on warning-as-error flag for doc build
- * rearrange existing documentation using the new standard layout
-
--------------------------------------------------------------------
-Thu Jun 29 16:16:36 UTC 2017 - tbechtold@suse.com
-
-- update to 3.1.1:
- * Restore previous IP binding
- * allow user to override the output location of api docs
- * fix tests based on API change in Sphinx
- * Updated from global requirements
- * Add binding option for WSGI server
- * Ignore index URL lines in requirements.txt files
-
--------------------------------------------------------------------
-Fri Jun 23 15:21:37 UTC 2017 - jmatejek@suse.com
-
-- drop upstreamed make_oslosphinx_optional.patch
-
--------------------------------------------------------------------
-Wed Mar 29 11:59:55 UTC 2017 - tbechtold@suse.com
-
-- Fix Source url
-
--------------------------------------------------------------------
-Thu Mar 9 10:40:10 UTC 2017 - aplanas@suse.com
-
-- Add make_oslosphinx_optional.patch
- https://review.openstack.org/#/c/443555/
-
--------------------------------------------------------------------
-Wed Mar 8 10:30:49 UTC 2017 - aplanas@suse.com
-
-- Update to pbr-2.0.0
- * tox: Don't set skipsdist=True
- * Stop using 'warnerrors'
- * doc: Clarify sections in 'setup.cfg'
- * Updated from global requirements
- * Remove discover from test-requirements
- * Add Constraints support
- * Don't raise exception on missing man pages
- * Updated from global requirements
- * Clean imports in code
- * Updated from global requirements
- * Docstrings should not start with a space
- * Changed the home-page link
- * Update .coveragerc after the removal of openstack directory
- * coverage package name option, doc improvement
- * Updated from global requirements
- * Deprecated warning for SafeConfigParser
- * Add more words to a confusing error message
- * Don't ignore data-files
- * Change assertTrue(isinstance()) by optimal assert
- * Fix handling of old git log output
- * Fix typo in the index.rst
- * Expose deb version to match exposing rpm version
- * Replace OpenStack LLC with OpenStack Foundation
- * Updated from global requirements
- * Fix pypy soabi tests
- * Add Python 3.5 classifier and venv
- * Fix argument order for assertEqual to (expected, observed)
- * Move to oslosphinx
- * Updated from global requirements
- * Restore warnerrors behavior and support Sphinx 1.4
- * Updated from global requirements
- * Updated from global requirements
- * Updated from global requirements
- * Fix pypy wsgi tests
- * Remember the insertion order for pbr.json
-- Remove 0001-Don-t-ignore-data-files.patch (included)
-- Remove 0001-Don-t-raise-exception-on-missing-man-pages.patch (included)
-
--------------------------------------------------------------------
-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
-
-- Fix pypi source
-
--------------------------------------------------------------------
-Tue May 24 04:50:22 UTC 2016 - tbechtold@suse.com
-
-- update to 1.10.0:
- * File is wrongly marked as executable
- * Fix wsgiref script use with oslo.config
- * Update Preversioning explanation to avoid double that
- * Handle IndexError during version string parsing
- * Correct server test
- * Updated from global requirements
- * Fix soabi tests with pypy
- * package: fix wrong catch in email parsing
- * Do not convert git tags when searching history
- * Include wsgi_scripts in generated wheels
- * Correct the indentation in the classifiers example
- * Do not silently drop markers that fail to evaluate
- * Clarifications around tags and version numbers
- * Correct typo - s/enabeld/enabled/
- * Use apt-cache generated packages to provide build deps
- * fix some variable names
- * Don't attempt to test with 0.6c11 with Py3
- * Support entry point patching on setuptools < 12
- * Updated from global requirements
- * Split changelog on nulls instead of (
- * Add libjpeg and liberasurecode for tests
- * Handle markers to support sdist on pip < 6
- * Deprecated tox -downloadcache option removed
- * passenv integration environment variables re-enabling integration tests
- * Enable pep8 H405 tests
- * Add patch to properly get all commands from dist
- * doc: Remove 'MANIFEST.in'
- * doc: Trivial cleanup of 'index.rst'
- * doc: Add deprecation note for 'requirements-pyN'
- * doc: Restructure 'Requirements' section
- * doc: Restructure 'Usage' section
- * doc: Add details of manifest generation
- * Support git://, git+ssh://, git+https:// without -e flag
- * More support Sphinx >=1.3b1 and <1.3.1
- * Fix docs for markers
- * Do not error when running pep8 with py3
- * Ensure changelog log output is written if it already exists
- * Cleanup jeepyb and pypi-mirror special casing
-
--------------------------------------------------------------------
-Fri Apr 1 15:20:52 UTC 2016 - tbechtold@suse.com
-
-- update to 1.8.1:
- * Handle the case where cmd.distribution has no pbr attribute
- * test_integration cleanups
- * Remove redundant testscenarios glue
- * Add standard code coverage configuration file
- * Add shields.io version/downloads links/badges into README.rst
-
--------------------------------------------------------------------
-Sun Sep 20 09:03:29 UTC 2015 - tbechtold@suse.com
-
-- update to 1.8.0:
- * Strip comments present in setup.cfg
- * Protect WSGI application with a critical section
-- Remove 0001-Remove-sphinx_config.init_values-manual-call.patch
- Fixed upstream
-
--------------------------------------------------------------------
-Wed Sep 9 06:42:06 UTC 2015 - tbechtold@suse.com
-
-- update to 1.7.0:
- * Have pbr egg_info.writer check PBR is enabled
-
--------------------------------------------------------------------
-Wed Aug 26 06:20:59 UTC 2015 - tbechtold@suse.com
-
-- update to 1.6.0:
- * Strip comments in requirements files
- * Handle git being entirely absent
- * We require the use of setuptools
- * Fix retrieval of commit data and most recent tag
-
--------------------------------------------------------------------
-Tue Aug 11 07:34:34 UTC 2015 - seife+obs@b1-systems.com
-
-- update to version 1.4.0
- * Fix docs for environment markers in extras
- * Export ChangeLog and AUTHORS in install
- * Show how long the git querying takes
- * Add wsgi_scripts support to PBR
- * Updated from global requirements
-- requires python-mock >= 1.2
-
--------------------------------------------------------------------
-Mon Aug 3 09:46:34 UTC 2015 - toddrme2178@gmail.com
-
-- Split documentation into own package to avoid dependency loop
diff --git a/python-pbr-doc.spec b/python-pbr-doc.spec
deleted file mode 100644
index 94e6a32..0000000
--- a/python-pbr-doc.spec
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-# spec file for package python-pbr-doc
-#
-# Copyright (c) 2018 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/
-#
-
-
-%{?!python_module:%define python_module() python-%{**} python3-%{**}}
-Name: python-pbr-doc
-Version: 4.0.3
-Release: 0
-Summary: Documentation for python-pbr
-License: Apache-2.0
-Group: Development/Languages/Python
-URL: http://pypi.python.org/pypi/pbr
-Source: https://files.pythonhosted.org/packages/source/p/pbr/pbr-%{version}.tar.gz
-Source1: python-pbr-rpmlintrc
-Patch0: for_sphinx.patch
-BuildRequires: fdupes
-# Documentation requirements:
-BuildRequires: python3-Sphinx >= 1.6.2
-BuildRequires: python3-setuptools
-Provides: %{python_module pbr-doc = %{version}}
-BuildArch: noarch
-
-%description
-This package contains documentation files for python-pbr
-
-%prep
-%setup -q -n pbr-%{version}
-# Get rid of ugly build-time deps that require network:
-sed -i "s/, 'sphinx\.ext\.intersphinx'//" doc/source/conf.py
-%patch0 -p1
-
-%build
-python3 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
-%license LICENSE
-%{_docdir}/python-pbr/
-
-%changelog
diff --git a/python-pbr-rpmlintrc b/python-pbr-rpmlintrc
deleted file mode 100644
index a77bc8e..0000000
--- a/python-pbr-rpmlintrc
+++ /dev/null
@@ -1,2 +0,0 @@
-# It's just the testsuite:
-addFilter("E: devel-file-in-non-devel-package")
diff --git a/python-pbr.changes b/python-pbr.changes
index 3d2091b..cbf0221 100644
--- a/python-pbr.changes
+++ b/python-pbr.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Mon Aug 6 10:03:48 UTC 2018 - tchvatal@suse.com
+
+- Switch to multibuild to run tests
+- Drop doc subpkg, they have compiled docu on web, much better
+ * Drops patch for_sphinx.patch
+
+-------------------------------------------------------------------
+Mon Aug 6 09:37:30 UTC 2018 - tchvatal@suse.com
+
+- Version update to 4.1.1:
+ * Fixes on python 3.x
+
-------------------------------------------------------------------
Fri May 25 09:48:46 UTC 2018 - mimi.vx@gmail.com
diff --git a/python-pbr.spec b/python-pbr.spec
index 2911bec..0bb4816 100644
--- a/python-pbr.spec
+++ b/python-pbr.spec
@@ -17,37 +17,45 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
-# NOTE(saschpe): git invocation and pythonpath issues with testrepository
-# enable testing with a build conditional (off by default):
+%global flavor @BUILD_FLAVOR@%{nil}
+%if "%{flavor}" == "test"
+%bcond_without test
+%endif
%bcond_with test
-Name: python-pbr
-Version: 4.0.3
+Version: 4.1.1
Release: 0
Summary: Python Build Reasonableness
License: Apache-2.0
Group: Development/Languages/Python
URL: http://pypi.python.org/pypi/pbr
Source: https://files.pythonhosted.org/packages/source/p/pbr/pbr-%{version}.tar.gz
-Source1: python-pbr-rpmlintrc
-BuildRequires: %{python_module devel}
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
Requires: python-setuptools
Requires(post): update-alternatives
Requires(postun): update-alternatives
+Obsoletes: python-pbr-doc
BuildArch: noarch
-# Test requirements:
%if %{with test}
-#BuildRequires: python-coverage >= 3.6
-BuildRequires: %{python_module fixtures >= 1.3.1}
-BuildRequires: %{python_module mock >= 1.2}
-BuildRequires: %{python_module python-subunit >= 0.0.18}
+Name: python-pbr-%{flavor}
+%else
+Name: python-pbr
+%endif
+%if %{with test}
+BuildRequires: %{python_module Sphinx >= 1.6.2}
+BuildRequires: %{python_module devel}
+BuildRequires: %{python_module fixtures >= 3.0.0}
+BuildRequires: %{python_module mock >= 2.0}
BuildRequires: %{python_module six >= 1.9.0}
BuildRequires: %{python_module testrepository >= 0.0.18}
-BuildRequires: %{python_module testresources >= 0.2.4}
+BuildRequires: %{python_module testresources >= 2.0.0}
BuildRequires: %{python_module testscenarios >= 0.4}
-BuildRequires: %{python_module testtools >= 1.4.0}
+BuildRequires: %{python_module testtools >= 2.2.0}
+BuildRequires: %{python_module virtualenv >= 14.0.6}
+BuildRequires: %{python_module wheel}
+BuildRequires: git
+BuildRequires: gpg2
%endif
%python_subpackages
@@ -71,28 +79,37 @@ chmod -x pbr/tests/testpackage/setup.py
%python_build
%install
+%if !%{with test}
%python_install
+%python_expand rm -rf %{buildroot}%{$python_sitelib}/pbr/tests
%python_clone -a %{buildroot}%{_bindir}/pbr
%python_expand %fdupes %{buildroot}%{$python_sitelib}
+%endif
%if %{with test}
%check
-%python_exec %{_bindir}/testr init
-%python_exec %{_bindir}/testr run --parallel
+%{python_expand rm -rf .testrepository
+$python %{_bindir}/testr init
+$python %{_bindir}/testr run --parallel
+}
%endif
+%if !%{with test}
%post
%python_install_alternative pbr
%postun
%python_uninstall_alternative pbr
+%endif
%files %{python_files}
%license LICENSE
+%if !%{with test}
%doc AUTHORS ChangeLog CONTRIBUTING.rst README.rst
%python_alternative %{_bindir}/pbr
%{python_sitelib}/pbr
%{python_sitelib}/pbr-%{version}-py%{python_version}.egg-info
+%endif
%changelog