diff --git a/subversion-1.14.1-testnoautoprops.patch b/subversion-1.14.1-testnomagic.patch similarity index 94% rename from subversion-1.14.1-testnoautoprops.patch rename to subversion-1.14.1-testnomagic.patch index 96dd59d..ff13e1a 100644 --- a/subversion-1.14.1-testnoautoprops.patch +++ b/subversion-1.14.1-testnomagic.patch @@ -8,7 +8,7 @@ the output is different. [miscellany] interactive-conflicts = false -+enable-auto-props = no ++enable-magic-file = no """ if exclusive_wc_locks: config_contents += """ diff --git a/subversion.spec b/subversion.spec index 9e98ddd..f72c2ed 100644 --- a/subversion.spec +++ b/subversion.spec @@ -59,7 +59,7 @@ Summary: A Modern Concurrent Version Control System Name: subversion Version: 1.14.2 -Release: 4%{?dist} +Release: 5%{?dist} License: ASL 2.0 URL: https://subversion.apache.org/ Source0: https://downloads.apache.org/subversion/subversion-%{version}.tar.bz2 @@ -75,7 +75,7 @@ Patch2: subversion-1.14.0-testwarn.patch Patch3: subversion-1.14.0-soversion.patch Patch4: subversion-1.8.0-rubybind.patch Patch5: subversion-1.8.5-swigplWall.patch -Patch6: subversion-1.14.1-testnoautoprops.patch +Patch6: subversion-1.14.1-testnomagic.patch Patch8: subversion-1.14.1-python-3.11-build.patch BuildRequires: make @@ -239,7 +239,7 @@ This package includes supplementary tools for use with Subversion. %patch3 -p1 -b .soversion %patch4 -p1 -b .rubybind %patch5 -p1 -b .swigplWall -%patch6 -p1 -b .testnoautoprops +%patch6 -p1 -b .testnomagic %patch8 -p1 -b .pythonbuild : @@ -581,6 +581,9 @@ make check-javahl %endif %changelog +* Tue Jul 5 2022 Joe Orton - 1.14.2-5 +- disable libmagic during test runs + * Tue Jul 5 2022 Joe Orton - 1.14.2-4 - update for new Java arches and bump to JDK 17 (#2103909)