Hello community, here is the log from the commit of package borgbackup for openSUSE:Factory checked in at 2018-03-09 10:46:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/borgbackup (Old) and /work/SRC/openSUSE:Factory/.borgbackup.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "borgbackup" Fri Mar 9 10:46:39 2018 rev:13 rq:584480 version:1.1.4 Changes: -------- --- /work/SRC/openSUSE:Factory/borgbackup/borgbackup.changes 2018-03-02 21:12:43.858733932 +0100 +++ /work/SRC/openSUSE:Factory/.borgbackup.new/borgbackup.changes 2018-03-09 10:46:41.310478229 +0100 @@ -1,0 +2,12 @@ +Mon Mar 5 10:52:25 UTC 2018 - [email protected] + +- Fix sphinx theme fallback condition + +------------------------------------------------------------------- +Sun Mar 4 13:26:04 UTC 2018 - [email protected] + +- Add patch to fall back to a sphinx default theme for older distributions + that don't have python3-guzzle_sphinx_theme available + * borgbackup-1.1.4-sphinx-default-theme.patch + +------------------------------------------------------------------- New: ---- borgbackup-1.1.4-sphinx-default-theme.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ borgbackup.spec ++++++ --- /var/tmp/diff_new_pack.oUwH33/_old 2018-03-09 10:46:42.206445955 +0100 +++ /var/tmp/diff_new_pack.oUwH33/_new 2018-03-09 10:46:42.210445811 +0100 @@ -2,7 +2,7 @@ # spec file for package borgbackup # # Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. -# Copyright (c) 2016-2017 LISA GmbH, Bingen, Germany. +# Copyright (c) 2016-2018 LISA GmbH, Bingen, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,7 +28,13 @@ # PATCH-FIX-UPSTREAM borgbackup-1.1.4-binary-content-checks.patch gh#borgbackup/borg#3544 # Already applied upstream, this patch will not be needed in borgbackup > 1.1.4 Patch0: borgbackup-1.1.4-binary-content-checks.patch +# PATCH-FIX-OPENSUSE fix-msgpack-requirement.patch <[email protected]> +# deal with msgpack package rename fallout Patch1: fix-msgpack-requirement.patch +# PATCH-FIX-OPENSUSE borgbackup-1.1.4-sphinx-default-theme.patch <[email protected]> +# python3-guzzle_sphinx_theme isn't available everywhere, +# fall back to Sphinx default theme for older distributions +Patch2: borgbackup-1.1.4-sphinx-default-theme.patch BuildRequires: libacl-devel %if 0%{?suse_version} >= 1500 BuildRequires: liblz4-devel >= 1.7.0 @@ -129,9 +135,14 @@ %prep %setup -q %patch0 -p1 +# fix msgpack requirement %if 0%{?suse_version} > 1500 %patch1 -p1 %endif +# fall back to sphinx default theme +%if 0%{?suse_version} < 1500 +%patch2 -p1 +%endif # a single test is failing: test_non_ascii_acl - which is a rather esoteric check # that cannot be tripped with openSUSE, because user- and group-ids have to be # 7-bit ascii clean, and the test involves in setting an acl for an utf-8 encoded ++++++ borgbackup-1.1.4-sphinx-default-theme.patch ++++++ diff -up -r borgbackup-1.1.4/docs/conf.py borgbackup.1.1.4.new/docs/conf.py --- borgbackup-1.1.4/docs/conf.py 2017-12-30 10:14:25.000000000 +0100 +++ borgbackup.1.1.4/docs/conf.py 2018-03-04 14:15:42.439486356 +0100 @@ -99,10 +99,11 @@ pygments_style = 'sphinx' # The theme to use for HTML and HTML Help pages. See the documentation for # a list of builtin themes. -import guzzle_sphinx_theme +#import guzzle_sphinx_theme -html_theme_path = guzzle_sphinx_theme.html_theme_path() -html_theme = 'guzzle_sphinx_theme' +#html_theme_path = guzzle_sphinx_theme.html_theme_path() +#html_theme = 'guzzle_sphinx_theme' +html_theme = 'classic' def set_rst_settings(app): diff -up -r borgbackup-1.1.4/docs/_templates/logo-text.html borgbackup.1.1.4.new/docs/_templates/logo-text.html --- borgbackup-1.1.4/docs/_templates/logo-text.html 2017-12-30 10:14:25.000000000 +0100 +++ borgbackup.1.1.4/docs/_templates/logo-text.html 2018-03-04 14:12:18.749419915 +0100 @@ -1,5 +0,0 @@ -<a href="{{ homepage() }}" class="text-logo"> - <img src='{{ pathto('_static/logo.svg', 1) }}' width='100%'> - - {{ theme_project_nav_name or shorttitle }} -</a>
