diff --git a/disable-fs-fs-pack-test.patch b/disable-fs-fs-pack-test.patch new file mode 100644 index 0000000..8d99beb --- /dev/null +++ b/disable-fs-fs-pack-test.patch @@ -0,0 +1,20 @@ +diff --git a/build.conf b/build.conf +index 7631a61..f9551f0 100644 +--- a/build.conf ++++ b/build.conf +@@ -805,15 +805,6 @@ msvc-force-static = yes + + # ---------------------------------------------------------------------------- + # Tests for libsvn_fs_fs +-[fs-fs-pack-test] +-description = Test fsfs packing in libsvn_fs_fs +-type = exe +-path = subversion/tests/libsvn_fs_fs +-sources = fs-fs-pack-test.c +-install = test +-libs = libsvn_test libsvn_fs libsvn_fs_fs libsvn_delta +- libsvn_subr apriconv apr +-msvc-force-static = yes + + [fs-fs-fuzzy-test] + description = Use fuzzying to test FSFS corruption resilience diff --git a/subversion.changes b/subversion.changes index 59fbab7..76bc1ad 100644 --- a/subversion.changes +++ b/subversion.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue May 5 09:24:22 UTC 2020 - Martin Liška + +- Add gcc10-do-not-optimize-get_externals_to_pin.patch in order + to fix boo#1170834. + ------------------------------------------------------------------- Wed Apr 15 07:39:43 UTC 2020 - Tomáš Chvátal diff --git a/subversion.spec b/subversion.spec index a2425b5..1d3496d 100644 --- a/subversion.spec +++ b/subversion.spec @@ -65,6 +65,7 @@ Patch41: subversion-1.12.0-swig-4.patch Patch42: gcc10-do-not-optimize-get_externals_to_pin.patch Patch43: ruby27-warnings.patch Patch44: ruby-includes.patch +Patch45: disable-fs-fs-pack-test.patch BuildRequires: apache-rpm-macros BuildRequires: apache2-devel >= 2.2.0 BuildRequires: apache2-prefork @@ -248,6 +249,7 @@ parameters and keywords for the svn command and other tools. %patch42 -p1 %patch43 -p1 %patch44 -p1 +%patch45 -p1 %build # Re-boot strap, needed for patch37