From 3ef9dd2eb3c8730d9e3108b94136d77a8fea3a7d Mon Sep 17 00:00:00 2001
From: Joe Orton <jorton@redhat.com>
Date: Jul 05 2022 15:08:46 +0000
Subject: disable libmagic during test runs


---

diff --git a/subversion-1.14.1-testnoautoprops.patch b/subversion-1.14.1-testnoautoprops.patch
deleted file mode 100644
index 96dd59d..0000000
--- a/subversion-1.14.1-testnoautoprops.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-
-Fix intermittent failures when "svn add" guesses a near-empty file is binary and hence
-the output is different.
-
---- subversion-1.14.1/subversion/tests/cmdline/svntest/main.py.testnoautoprops
-+++ subversion-1.14.1/subversion/tests/cmdline/svntest/main.py
-@@ -691,6 +691,7 @@
- 
- [miscellany]
- interactive-conflicts = false
-+enable-auto-props = no
- """
-     if exclusive_wc_locks:
-       config_contents += """
diff --git a/subversion-1.14.1-testnomagic.patch b/subversion-1.14.1-testnomagic.patch
new file mode 100644
index 0000000..ff13e1a
--- /dev/null
+++ b/subversion-1.14.1-testnomagic.patch
@@ -0,0 +1,14 @@
+
+Fix intermittent failures when "svn add" guesses a near-empty file is binary and hence
+the output is different.
+
+--- subversion-1.14.1/subversion/tests/cmdline/svntest/main.py.testnoautoprops
++++ subversion-1.14.1/subversion/tests/cmdline/svntest/main.py
+@@ -691,6 +691,7 @@
+ 
+ [miscellany]
+ interactive-conflicts = false
++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 <jorton@redhat.com> - 1.14.2-5
+- disable libmagic during test runs
+
 * Tue Jul  5 2022 Joe Orton <jorton@redhat.com> - 1.14.2-4
 - update for new Java arches and bump to JDK 17 (#2103909)