diff --git a/subversion-1.14.3-zlib-ng.patch b/subversion-1.14.3-zlib-ng.patch new file mode 100644 index 0000000..1b1a78a --- /dev/null +++ b/subversion-1.14.3-zlib-ng.patch @@ -0,0 +1,25 @@ +commit ca640b37f8a50b18d76970fd6554e05801b7e81b +Author: Tomas Korbar +Date: Fri Jan 12 14:39:26 2024 +0100 + + Fix tests with zlib-ng + +diff --git a/subversion/tests/cmdline/patch_tests.py b/subversion/tests/cmdline/patch_tests.py +index f52f12e..5950170 100755 +--- a/subversion/tests/cmdline/patch_tests.py ++++ b/subversion/tests/cmdline/patch_tests.py +@@ -5797,11 +5797,11 @@ def patch_binary_file(sbox): + 'diff --git a/iota b/iota\n', + 'GIT binary patch\n', + 'literal 48\n', +- 'zc$^E#$ShU>qLPeMg|y6^R0Z|S{E|dqLPeMg|y6^R0Z|S{E|d<{9\n', + '\n', + 'Property changes on: iota\n', + '___________________________________________________________________\n', diff --git a/subversion.spec b/subversion.spec index 34c9f5f..a634bfc 100644 --- a/subversion.spec +++ b/subversion.spec @@ -60,7 +60,7 @@ Summary: A Modern Concurrent Version Control System Name: subversion Version: 1.14.3 -Release: 1%{?dist} +Release: 2%{?dist} License: Apache-2.0 URL: https://subversion.apache.org/ Source0: https://downloads.apache.org/subversion/subversion-%{version}.tar.bz2 @@ -79,6 +79,8 @@ Patch5: subversion-1.8.5-swigplWall.patch Patch6: subversion-1.14.1-testnomagic.patch Patch7: subversion-ruby-c99.patch Patch8: subversion-1.14.2-modsyms.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=2255746 +Patch9: subversion-1.14.3-zlib-ng.patch BuildRequires: make BuildRequires: autoconf, libtool, texinfo, which, gcc, gcc-c++ BuildRequires: swig >= 1.3.24, gettext @@ -243,6 +245,7 @@ This package includes supplementary tools for use with Subversion. %patch -P6 -p1 -b .testnomagic %patch -P7 -p1 %patch -P8 -p1 -b .modsyms +%patch -P9 -p1 -b .zlib : : === Building: @@ -584,6 +587,10 @@ make check-javahl %endif %changelog +* Fri Jan 12 2024 Tomas Korbar - 1.14.3-2 +- Fix testing of binary patch +- Resolves: rhbz#2255746 + * Fri Jan 05 2024 Richard Lescak - 1.14.3-1 - rebase to version 1.14.3 (#2256062)