diff --git a/0003-ability-to-unbundle-msgpack.patch b/0003-ability-to-unbundle-msgpack.patch index 4a42b8b..53518b0 100644 --- a/0003-ability-to-unbundle-msgpack.patch +++ b/0003-ability-to-unbundle-msgpack.patch @@ -1,5 +1,5 @@ diff --git a/setup.py b/setup.py -index 8cdaef3..d79bf1c 100644 +index dd63695..3b92421 100644 --- a/setup.py +++ b/setup.py @@ -26,6 +26,8 @@ prefer_system_libzstd = True @@ -32,7 +32,7 @@ index 8cdaef3..d79bf1c 100644 # note for package maintainers: if you package borgbackup for distribution, # please add llfuse as a *requirement* on all platforms that have a working -@@ -98,9 +114,9 @@ cython_c_sources = [ +@@ -100,9 +116,9 @@ cython_c_sources = [ cython_cpp_sources = [ # these .pyx will get compiled to .cpp @@ -44,8 +44,8 @@ index 8cdaef3..d79bf1c 100644 try: from Cython.Distutils import build_ext -@@ -130,9 +146,12 @@ try: - 'src/borg/platform/linux.c', +@@ -133,9 +149,12 @@ try: + 'src/borg/platform/syncfilerange.c', 'src/borg/platform/freebsd.c', 'src/borg/platform/darwin.c', - 'src/borg/algorithms/msgpack/_packer.cpp', @@ -59,7 +59,7 @@ index 8cdaef3..d79bf1c 100644 super().make_distribution() except ImportError: -@@ -154,11 +173,15 @@ except ImportError: +@@ -158,11 +177,15 @@ except ImportError: msgpack_packer_source = msgpack_packer_source.replace('.pyx', '.cpp') msgpack_unpacker_source = msgpack_unpacker_source.replace('.pyx', '.cpp') @@ -67,7 +67,7 @@ index 8cdaef3..d79bf1c 100644 - if not on_rtd and not all(os.path.exists(path) for path in [ + cythonized_sources = [ compress_source, crypto_ll_source, chunker_source, hashindex_source, item_source, checksums_source, - platform_posix_source, platform_linux_source, platform_freebsd_source, platform_darwin_source, + platform_posix_source, platform_linux_source, platform_syncfilerange_source, platform_freebsd_source, platform_darwin_source, - msgpack_packer_source, msgpack_unpacker_source]): + ] + if not prefer_system_msgpack: @@ -78,7 +78,7 @@ index 8cdaef3..d79bf1c 100644 raise ImportError('The GIT version of Borg needs Cython. Install Cython or use a released version.') -@@ -801,26 +824,29 @@ if not on_rtd: +@@ -805,26 +828,29 @@ if not on_rtd: system_prefix=libb2_prefix, system=libb2_system, **crypto_ext_kwargs) diff --git a/borgbackup.spec b/borgbackup.spec index c5cedc1..6812f34 100644 --- a/borgbackup.spec +++ b/borgbackup.spec @@ -7,8 +7,8 @@ %endif Name: %{srcname} -Version: 1.1.10 -Release: 7%{?dist} +Version: 1.1.11 +Release: 1%{?dist} Summary: A deduplicating backup program with compression and authenticated encryption %if %bundle_msgpack @@ -75,7 +75,8 @@ Requires: fuse # https://github.com/borgbackup/borg/pull/2580#issuecomment-305579398 # upstream won't unbundle this for v1.1.x: # https://github.com/borgbackup/borg/issues/4592#issuecomment-495951573 -Provides: bundled(xxHash) = 0.6.2 +# since borgbackup 1.1.11 the code needs at least xxHash >= 0.7.2 +Provides: bundled(xxHash) = 0.7.3 %description BorgBackup (short: Borg) is a deduplicating backup program. Optionally, it @@ -188,6 +189,9 @@ py.test-3 -x -vk "$TEST_SELECTOR" $PYTHONPATH/borg/testsuite/*.py %changelog +* Sun Mar 08 2020 Felix Schwarz - 1.1.11-1 +- update to 1.1.11 + * Tue Jan 28 2020 Fedora Release Engineering - 1.1.10-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 1607059..76c846b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (borgbackup-1.1.10.tar.gz) = 9315335208f10427e3105e10819817d15fd05171479252903bd51eaacb016bc3ff792d505b9203ce0b9b41ec350472bdb9a23b0128e7fe156aaa47c1608451c0 -SHA512 (borgbackup-1.1.10.tar.gz.asc) = 608f90f485c05543e46e39aa11490baf064b436934262b40a2e77919ed64f7e4fa14bf3277ae3f8224b9cd8bcc00122639f2671d408972bb4bc164bd55cb3bbc +SHA512 (borgbackup-1.1.11.tar.gz) = cf629f31d38d27ce6350670ff27b4937f2f30eddf9e0cd9209cd9d57a4ffa653f5a291ea1e1c79614dd2c08bcf5c50bc3e4e0f222e0d3cd1bbfb2d756b4a4573 +SHA512 (borgbackup-1.1.11.tar.gz.asc) = 8d5ae01802b1307d20f056a13f393a43eb216182f787cbf0a679c7fd70c881f4fc81f12cce466b59f00c1631bde97b506c3a8215196dfdee2f5c4f86104a1192