From f332894a2adddd956a8b77f3e8dae1df30aaa58b9fa41e3d6baef78802fd3717 Mon Sep 17 00:00:00 2001 From: Denisart Benjamin Date: Sat, 18 Apr 2015 10:39:41 +0000 Subject: [PATCH] Accepting request 297159 from home:frispete:python - update to version 0.10.8 - 0.10.8 * Support script text override for newer develop - 0.10.7 * _get_revno only returns a commit count - 0.10.6 * Integration test PBR commits - 0.10.5 * Move write_pbr_json to avoid issues with nose - 0.10.4 * Properly check for git before getting git dir * Use post version signifiers * Only import sphinx during hook processing - 0.10.3 * Stop including git sha in version strings * Write and read more complex git sha info - 0.10.2 * Remove all 2.7 filtering * Stop filtering out argparse * Remove mirror testing from the integration script - 0.10.1 * Prefix git suffixes with + instead of - fix Sphinx config.init_values fallout - add update-alternatives - remove outdated patches - put docs in its own package OBS-URL: https://build.opensuse.org/request/show/297159 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pbr?expand=0&rev=24 --- ...g-sphinx-builder-list-from-command-l.patch | 32 ------------- ...se-get_boolean_option-for-warnerrors.patch | 28 ----------- pbr-0.10.0.tar.gz | 3 -- pbr-0.10.8-fix-sphinx-init_values.patch | 13 ++++++ pbr-0.10.8.tar.gz | 3 ++ python-pbr.changes | 31 +++++++++++++ python-pbr.spec | 46 +++++++++++++++---- 7 files changed, 85 insertions(+), 71 deletions(-) delete mode 100644 0001-Allow-overwriting-sphinx-builder-list-from-command-l.patch delete mode 100644 0001-use-get_boolean_option-for-warnerrors.patch delete mode 100644 pbr-0.10.0.tar.gz create mode 100644 pbr-0.10.8-fix-sphinx-init_values.patch create mode 100644 pbr-0.10.8.tar.gz diff --git a/0001-Allow-overwriting-sphinx-builder-list-from-command-l.patch b/0001-Allow-overwriting-sphinx-builder-list-from-command-l.patch deleted file mode 100644 index 108cfcd..0000000 --- a/0001-Allow-overwriting-sphinx-builder-list-from-command-l.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 0a56da8b582842e767046977e61a7021ab279f44 Mon Sep 17 00:00:00 2001 -From: Dirk Mueller -Date: Thu, 28 Aug 2014 12:42:56 +0200 -Subject: [PATCH] Allow overwriting sphinx builder list from command line - -This restores the behavior of being able to explicitely select -only one builder via "python setup.py build_sphinx -b man". - -Change-Id: I4c7ddcaf413e1bcc72550b3d920f8a777a710c97 ---- - pbr/packaging.py | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/pbr/packaging.py b/pbr/packaging.py -index a57b453..b910587 100644 ---- a/pbr/packaging.py -+++ b/pbr/packaging.py -@@ -761,6 +761,11 @@ try: - # Allow builders to be configurable - as a comma separated list. - if not isinstance(self.builders, list) and self.builders: - self.builders = self.builders.split(',') -+ # Handle builder option from command line -+ option_dict = self.distribution.get_option_dict('build_sphinx') -+ if 'command line' in option_dict.get('builder', [[]])[0]: -+ self.builders = [x for x in self.builders -+ if x == option_dict['builder'][1]] - - class LocalBuildLatex(LocalBuildDoc): - builders = ['latex'] --- -2.0.4 - diff --git a/0001-use-get_boolean_option-for-warnerrors.patch b/0001-use-get_boolean_option-for-warnerrors.patch deleted file mode 100644 index c86c79c..0000000 --- a/0001-use-get_boolean_option-for-warnerrors.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 2a31f03dc32a7f07059d3e4e3f918474c4af2669 Mon Sep 17 00:00:00 2001 -From: Dirk Mueller -Date: Thu, 28 Aug 2014 12:28:15 +0200 -Subject: [PATCH] use get_boolean_option for warnerrors - -This way even warnerrors = 0 is handled properly. - -Change-Id: I83d2eb105d07fd65ebc720c63038fc3c542b7f90 ---- - pbr/packaging.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/pbr/packaging.py b/pbr/packaging.py -index a57b453..0f31950 100644 ---- a/pbr/packaging.py -+++ b/pbr/packaging.py -@@ -750,7 +750,7 @@ try: - self.project = self.distribution.get_name() - self.version = self.distribution.get_version() - self.release = self.distribution.get_version() -- if 'warnerrors' in option_dict: -+ if get_boolean_option(option_dict, 'warnerrors', 'WARNERRORS'): - self._sphinx_run() - else: - setup_command.BuildDoc.run(self) --- -2.0.4 - diff --git a/pbr-0.10.0.tar.gz b/pbr-0.10.0.tar.gz deleted file mode 100644 index f747e36..0000000 --- a/pbr-0.10.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:52a61a863566fafa45507a9aa40e6c88edc1e09d96cde5f5a6aa3b4d26c913ce -size 77690 diff --git a/pbr-0.10.8-fix-sphinx-init_values.patch b/pbr-0.10.8-fix-sphinx-init_values.patch new file mode 100644 index 0000000..da13014 --- /dev/null +++ b/pbr-0.10.8-fix-sphinx-init_values.patch @@ -0,0 +1,13 @@ +Index: b/pbr/builddoc.py +=================================================================== +--- a/pbr/builddoc.py ++++ b/pbr/builddoc.py +@@ -123,7 +123,7 @@ class LocalBuildDoc(setup_command.BuildD + if self.today: + confoverrides['today'] = self.today + sphinx_config = config.Config(self.config_dir, 'conf.py', {}, []) +- sphinx_config.init_values() ++ sphinx_config.init_values(log.info) + if self.builder == 'man' and len(sphinx_config.man_pages) == 0: + return + app = application.Sphinx( diff --git a/pbr-0.10.8.tar.gz b/pbr-0.10.8.tar.gz new file mode 100644 index 0000000..64c6e64 --- /dev/null +++ b/pbr-0.10.8.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a741650c697abe9dd3da00039a57a45a15a6eed017a16f6b7e4c0161fae2b4b2 +size 82952 diff --git a/python-pbr.changes b/python-pbr.changes index 5d7419d..c1c3f9e 100644 --- a/python-pbr.changes +++ b/python-pbr.changes @@ -1,3 +1,34 @@ +------------------------------------------------------------------- +Thu Apr 16 08:53:20 UTC 2015 - hpj@urpla.net + +- update to version 0.10.8 + - 0.10.8 + * Support script text override for newer develop + - 0.10.7 + * _get_revno only returns a commit count + - 0.10.6 + * Integration test PBR commits + - 0.10.5 + * Move write_pbr_json to avoid issues with nose + - 0.10.4 + * Properly check for git before getting git dir + * Use post version signifiers + * Only import sphinx during hook processing + - 0.10.3 + * Stop including git sha in version strings + * Write and read more complex git sha info + - 0.10.2 + * Remove all 2.7 filtering + * Stop filtering out argparse + * Remove mirror testing from the integration script + - 0.10.1 + * Prefix git suffixes with + instead of + +- fix Sphinx config.init_values fallout +- add update-alternatives +- remove outdated patches +- put docs in its own package + ------------------------------------------------------------------- Fri Oct 24 09:38:37 UTC 2014 - toddrme2178@gmail.com diff --git a/python-pbr.spec b/python-pbr.spec index 1bdcf26..45ab63d 100644 --- a/python-pbr.spec +++ b/python-pbr.spec @@ -1,7 +1,7 @@ # # spec file for package python-pbr # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# 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 @@ -21,7 +21,7 @@ %bcond_with test Name: python-pbr -Version: 0.10.0 +Version: 0.10.8 Release: 0 Summary: Python Build Reasonableness License: Apache-2.0 @@ -29,8 +29,8 @@ 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 -Patch0: 0001-use-get_boolean_option-for-warnerrors.patch -Patch1: 0001-Allow-overwriting-sphinx-builder-list-from-command-l.patch +Patch: pbr-0.10.8-fix-sphinx-init_values.patch +BuildRequires: fdupes BuildRequires: python-devel BuildRequires: python-pip >= 1.4 # Documentation requirements: @@ -51,6 +51,8 @@ BuildRequires: python-testscenarios >= 0.4 BuildRequires: python-testtools >= 0.9.34 %endif Requires: python-pip >= 1.4 +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()")} @@ -65,29 +67,57 @@ 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 -%patch1 -p1 +%patch -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 -python setup.py build_sphinx +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 %{_bindir}/pbr-%{py_ver} %{buildroot}%{_sysconfdir}/alternatives/pbr +%fdupes -s %{buildroot}%{python_sitelib} %if %{with test} %check testr init && testr run --parallel %endif +%post +%_sbindir/update-alternatives \ + --install %{_bindir}/pbr pbr %{_bindir}/pbr-%{py_ver} 20 + +%preun +if [ $1 -eq 0 ] ; then + %_sbindir/update-alternatives --remove pbr %{_bindir}/pbr-%{py_ver} +fi + %files %defattr(-,root,root,-) -%doc README.rst AUTHORS LICENSE +%doc AUTHORS ChangeLog CONTRIBUTING.rst LICENSE README.rst %{python_sitelib}/pbr %{python_sitelib}/pbr-%{version}-py%{py_ver}.egg-info +%{_bindir}/pbr-%{py_ver} +%ghost %{_bindir}/pbr +%ghost %{_sysconfdir}/alternatives/pbr + +%files doc +%defattr(-,root,root,-) +%doc doc/build/html %changelog