SOURCES/subversion-1.14.0-findpy.patch

@@ -0,0 +1,11 @@
+--- subversion-1.14.0/build/find_python.sh.findpy
++++ subversion-1.14.0/build/find_python.sh
+@@ -26,7 +26,7 @@
+ for pypath in "$PYTHON" "$PYTHON2" "$PYTHON3" python python2 python3; do
+   if [ "x$pypath" != "x" ]; then
+     DETECT_PYTHON="import sys;sys.exit((sys.hexversion < $VERSION) and 1 or 0)"
+-    if "$pypath" -c "$DETECT_PYTHON" >/dev/null 2>/dev/null; then
++    if "$pypath" -c "$DETECT_PYTHON"; then
+       echo $pypath
+       exit 0
+     fi

SPECS/subversion.spec

@@ -1,11 +1,7 @@
 # set to zero to avoid running test suite
-%bcond_without tests
 
-%if 0%{?rhel} || 0%{?eln}
-%bcond_with kwallet
-%else
 %bcond_without kwallet
-%endif
+%bcond_without tests
 
 %if 0%{?fedora} > 32 || 0%{?rhel} > 8
 %bcond_with bdb
@@ -56,9 +52,10 @@
 Summary: A Modern Concurrent Version Control System
 Name: subversion
 Version: 1.14.1
-Release: 5%{?dist}
+Release: 2%{?dist}
 License: ASL 2.0
 URL: https://subversion.apache.org/
+
 Source0: https://downloads.apache.org/subversion/subversion-%{version}.tar.bz2
 Source1: subversion.conf
 Source3: filter-requires.sh
@@ -72,19 +69,18 @@ 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            
-Patch7: subversion-1.14.1-fixjavatests.patch
-Patch8: subversion-1.14.1-CVE-2022-24070.patch
+Patch6: subversion-1.14.0-findpy.patch
+Patch7: subversion-1.14.1-CVE-2022-24070.patch
+Patch8: subversion-1.14.1-testnoautoprops.patch
+Patch9: subversion-1.14.1-fixjavatests.patch
 
-
-BuildRequires: make
-BuildRequires: autoconf, libtool, texinfo, which, gcc, gcc-c++
+BuildRequires: autoconf, libtool, texinfo, which
 BuildRequires: swig >= 1.3.24, gettext
 %if %{with bdb}
 BuildRequires: libdb-devel >= 4.1.25
 %endif
 BuildRequires: %{svn_python_br}
-BuildRequires: apr-devel >= 1.5.0, apr-util-devel >= 1.3.0
+BuildRequires: apr-devel >= 1.3.0, apr-util-devel >= 1.3.0
 BuildRequires: libserf-devel >= 1.3.0, cyrus-sasl-devel
 BuildRequires: sqlite-devel >= 3.4.0, file-devel, systemd-units
 BuildRequires: utf8proc-devel, lz4-devel
@@ -113,7 +109,7 @@ compelling replacement for CVS.
 %package libs
 Summary: Libraries for Subversion Version Control system
 # APR 1.3.x interfaces are required
-Conflicts: apr%{?_isa} < 1.5.0
+Conflicts: apr%{?_isa} < 1.3.0
 # Enforced at run-time by ra_serf
 Conflicts: libserf%{?_isa} < 1.3.0
 
@@ -238,9 +234,11 @@ 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            
-%patch7 -p1 -b .fixjavatests
-%patch8 -p1 -b .cve24070
+%patch6 -p1 -b .findpy
+%patch7 -p1 -b .cve24070
+%patch8 -p1 -b .testnoautoprops
+%patch9 -p1 -b .fixjavatests
+
 
 :
 : === Building:
@@ -286,7 +284,6 @@ export CC=gcc CXX=g++ JAVA_HOME=%{jdk_path}
 
 %configure --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
         --disable-debug \
-        --enable-plaintext-password-storage \
         --with-swig --with-serf=%{_prefix} \
         --with-ruby-sitedir=%{ruby_vendorarchdir} \
         --with-ruby-test-verbose=verbose \
@@ -302,6 +299,7 @@ export CC=gcc CXX=g++ JAVA_HOME=%{jdk_path}
 %if %{with kwallet}
         --with-kwallet=%{_includedir}:%{_libdir} \
 %endif
+        --enable-plaintext-password-storage \
 %if %{with bdb}
         --with-berkeley-db \
 %else
@@ -469,13 +467,9 @@ fi
 %endif
 # check-swig-rb omitted: it runs svnserve
 %if %{with_java}
-%ifnarch aarch64
-# Breaks reliably on aarch64, timing issue?
-# Upstream discussion: https://lists.apache.org/x/thread.html/rff2b0ab98a30c5fc83ca5ab21bf3862036d3a5ac2fc768d027bb6fe4@%3Cdev.subversion.apache.org%3E
 make check-javahl
 %endif
 %endif
-%endif
 
 %post
 %systemd_post svnserve.service
@@ -586,46 +580,18 @@ make check-javahl
 %endif
 
 %changelog
-* Tue Apr 26 2022 Richard Lescak <rlescak@redhat.com> - 1.14.1-5
-- Fix for CVE-2022-24070 (#2076565)
-
-* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 1.14.1-4.1
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
-
-* Tue Jun 22 2021 Mohan Boddu <mboddu@redhat.com> - 1.14.1-3.1
-- Rebuilt for RHEL 9 BETA for openssl 3.0
-  Related: rhbz#1971065
-
-* Wed Apr 28 2021 Joe Orton <jorton@redhat.com> - 1.14.1-2.1
-- enable plaintext password storage (#1951484)
-
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.14.1-2
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+* Mon May 09 2022 Richard Lescak <rlescak@gmail.com> - 1.14.1-2
+- add fix for CVE-2022-24070
 
 * Wed Feb 10 2021 Joe Orton <jorton@redhat.com> - 1.14.1-1
-- update to 1.14.1 (#1927265, #1768698)
+- update to 1.14.1 for CVE-2020-17525 (#1923928)
 
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.14.0-12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Wed Jan 06 2021 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.14.0-11
-- F-34: rebuild against ruby 3.0
-
-* Fri Dec 11 2020 Joe Orton <jorton@redhat.com> - 1.14.0-10
-- strip libdir from pkgconfig files
+* Fri Dec 11 2020 Joe Orton <jorton@redhat.com> - 1.14.0-8
+- strip libdir from pkgconfig files (#1844947)
 - add missing -libs dep from python3-subversion
 
-* Thu Dec  3 2020 Joe Orton <jorton@redhat.com> - 1.14.0-9
-- fix KWallet conditional (#1902598)
-
-* Mon Nov 30 2020 Jan Grulich <jgrulich@redhat.com> - 1.14.0-8
-- Disable KWallet for RHEL and ELN
-  Resolves: bz#1902598
-
-* Tue Sep 29 2020 Joe Orton <jorton@redhat.com> - 1.14.0-7
-- bump required apr-devel
-- BR gcc, gcc-c++
+* Fri Dec 11 2020 Joe Orton <jorton@redhat.com> - 1.14.0-7
+- enable plaintext password storage (#1844947)
 
 * Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.14.0-6
 - Second attempt - Rebuilt for