Fix testing of binary patch

Resolves: rhbz#2255746
This commit is contained in:
Tomas Korbar 2024-01-12 15:26:13 +01:00
parent b0ad4baf4f
commit ec0991468e
2 changed files with 33 additions and 1 deletions

View File

@ -0,0 +1,25 @@
commit ca640b37f8a50b18d76970fd6554e05801b7e81b
Author: Tomas Korbar <tkorbar@redhat.com>
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|d<JuZf(=9bpB_PpZ!+|-hc%)E52)STkf{{Wp*\n',
- 'B5)uFa\n',
+ 'zc$^E#$ShXKELJGVNL5J7%t=*H&&)4LRM+ETXlib0ZEMdf&d*IP$;ix0=Ss~fPW=x6\n',
+ 'Dol+7K\n',
'\n',
'literal 25\n',
- 'ec$^E#$ShU>qLPeMg|y6^R0Z|S{E|d<JuU!m{s;*G\n',
+ 'gc$^E#$ShXKELJGVNL5J7%t=*H&&)4LRM+DI0B`;X2><{9\n',
'\n',
'Property changes on: iota\n',
'___________________________________________________________________\n',

View File

@ -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 <tkorbar@redhat.com> - 1.14.3-2
- Fix testing of binary patch
- Resolves: rhbz#2255746
* Fri Jan 05 2024 Richard Lescak <rlescak@redhat.com> - 1.14.3-1
- rebase to version 1.14.3 (#2256062)