From dc1906df847ed7b293fad05ad590db62f46e496a Mon Sep 17 00:00:00 2001 From: Felix Schwarz Date: Oct 08 2020 18:22:02 +0000 Subject: update to 1.1.14 --- diff --git a/borgbackup-strip-llfuse-versions.patch b/borgbackup-strip-llfuse-versions.patch new file mode 100644 index 0000000..11e7e9d --- /dev/null +++ b/borgbackup-strip-llfuse-versions.patch @@ -0,0 +1,15 @@ +https://mail.python.org/pipermail/borgbackup/2020q4/001699.html +diff --git a/setup.py b/setup.py +index 44191cf..66b196a 100644 +--- a/setup.py ++++ b/setup.py +@@ -66,8 +66,7 @@ extras_require = { + # llfuse 1.3 (tested shortly, looks ok), needs FUSE version >= 2.8.0 + # llfuse 2.0 will break API + 'fuse': [ +- 'llfuse >=1.3.4, <1.3.7; python_version <"3.9"', # broken on py39 +- 'llfuse >=1.3.7, <2.0; python_version >="3.9"', # broken on freebsd ++ 'llfuse >=1.3.4, <2.0', + ], + } + diff --git a/borgbackup.spec b/borgbackup.spec index 296447e..16bc8c6 100644 --- a/borgbackup.spec +++ b/borgbackup.spec @@ -7,8 +7,8 @@ %endif Name: %{srcname} -Version: 1.1.13 -Release: 2%{?dist} +Version: 1.1.14 +Release: 1%{?dist} Summary: A deduplicating backup program with compression and authenticated encryption %if %bundle_msgpack @@ -29,6 +29,8 @@ Source2: gpgkey-6D5B_EF9A_DD20_7580_5747_B70F_9F88_FB52_FAF7_B393.gpg Patch1: 0002-disable-sphinx-man-page-build.patch # ability not to build bundled msgpack Patch2: 0003-ability-to-unbundle-msgpack.patch +# https://mail.python.org/pipermail/borgbackup/2020q4/001699.html +Patch3: borgbackup-strip-llfuse-versions.patch BuildRequires: gnupg2 # build @@ -36,7 +38,7 @@ BuildRequires: python%{python3_pkgversion}-devel BuildRequires: python%{python3_pkgversion}-setuptools BuildRequires: python%{python3_pkgversion}-setuptools_scm BuildRequires: python%{python3_pkgversion}-Cython -BuildRequires: python%{python3_pkgversion}-llfuse +BuildRequires: python%{python3_pkgversion}-llfuse >= 1.3.4 %if %bundle_msgpack Provides: bundled(python%{python3_pkgversion}-msgpack) = 0.5.6 @@ -65,7 +67,7 @@ BuildRequires: libzstd-devel >= 1.3.0 Requires: python%{python3_pkgversion}-msgpack <= 0.5.6 %endif Requires: python%{python3_pkgversion}-setuptools -Requires: python%{python3_pkgversion}-llfuse +Requires: python%{python3_pkgversion}-llfuse >= 1.3.4 Requires: fuse # xxHash: https://github.com/Cyan4973/xxHash @@ -76,7 +78,7 @@ Requires: fuse # upstream won't unbundle this for v1.1.x: # https://github.com/borgbackup/borg/issues/4592#issuecomment-495951573 # since borgbackup 1.1.11 the code needs at least xxHash >= 0.7.2 -Provides: bundled(xxHash) = 0.7.3 +Provides: bundled(xxHash) = 0.7.4 %description BorgBackup (short: Borg) is a deduplicating backup program. Optionally, it @@ -182,6 +184,9 @@ py.test-3 -x -vk "$TEST_SELECTOR" $PYTHONPATH/borg/testsuite/*.py %changelog +* Thu Oct 08 2020 Felix Schwarz - 1.1.14-1 +- update to 1.1.14 + * Mon Jul 27 2020 Fedora Release Engineering - 1.1.13-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index c4cbaea..ed3c784 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (borgbackup-1.1.13.tar.gz.asc) = 578e4a9a66a922c3740f3e61f6c32e96e2bf40730b670a64daab4979b81c6b684fa90602600e510b45edcaaeb5506503c444516e76a0b397a27e60433f3e6038 -SHA512 (borgbackup-1.1.13.tar.gz) = 2480dba6c842659a248361b35b478120e50df3525b8f07d89dac4e78369bb1dad2679b9efa6a4d6f38637759666095dc2dcbb7750edccd97972e2c8980a51b84 +SHA512 (borgbackup-1.1.14.tar.gz) = 2aae851d38ec2431cd09f9390b3afa41ec44c2891a3698b01f036cebc5b64d7b7f328d7c95bf30fc29016b4bd2d2ada2613f895091e22148f3d4861f4facd35f +SHA512 (borgbackup-1.1.14.tar.gz.asc) = 596aae46fdb523e7df296d880ee843f369834e6ee033167c57a9e637def6307d1e708396d6d9e9a05f265eb3b416bd278a9a40d4fdc83f89abe41047d894a335