improve library versioning so filenames are unique across releases

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

clog2markdown

@@ -6,10 +6,13 @@ echo "This update includes the latest stable release of _Apache Subversion_, ver
 echo
 
 curl --silent -n "http://svn.apache.org/repos/asf/subversion/tags/$1/CHANGES" | \
-sed -n '
-4,/Version/{
-s/(r[0-9, retal]*)\;*//g;
-s,issue #\([0-9]*\),[issue \1](https://issues.apache.org/jira/browse/SVN-\1),;
+sed -n "
+/^#/d;
+/^Version ${1/-rc*/}/,/^Version /{
+/, from \/branches/d;
+/repos\/asf\/subversion\/tags/d;
+s,#\([0-9]*\),[SVN-\1](https://issues.apache.org/jira/browse/SVN-\1),;
+s/(r[0-9, retal]+)\*//g;
 s/^ *//;
 s/ +/ /g;
 s/^ *- \(.*\)$/#### \1/;
@@ -21,4 +24,4 @@ s,(r1.*),,g
 s,\(@[0-9]*\),\\\1,g
 p;
 }
-' -
+" -

pullrev.sh

@@ -0,0 +1,53 @@
+#!/bin/sh -e
+
+if [ $# -lt 1 ]; then
+    echo "What?"
+    exit 1
+fi
+
+repo="https://svn.apache.org/repos/asf/subversion/trunk"
+#repo="https://svn.apache.org/repos/asf/subversion/branches/1.11.x"
+prefix=`rpmspec -q --queryformat='%{name}-%{version}\n' ./subversion.spec | sed 1q`
+suffix="r$1${2:++}"
+fn="${prefix}-${suffix}.patch"
+vcurl="http://svn.apache.org/viewvc?view=revision&revision="
+
+if test -f ${fn}; then
+    mv -v -f ${fn} ${fn}\~
+    echo "# $0 $*" > ${fn}
+    sed '1{/#.*pullrev/d;};/^--- /,$d' < ${fn}\~ >> ${fn}
+else
+    echo "# $0 $*" > ${fn}
+fi
+
+new=0
+for r in $*; do
+   if ! grep -q "${vcurl}${r}" ${fn}; then
+       echo "${vcurl}${r}"
+       new=1
+   fi
+done >> ${fn}
+
+[ $new -eq 0 ] || echo >> ${fn}
+
+prev=/dev/null
+for r in $*; do
+    echo "+ fetching ${r}"
+    this=`mktemp /tmp/pullrevXXXXXX`
+    svn diff -c ${r} ${repo} | filterdiff --remove-timestamps --clean -x 'CHANGES' -x 'next-number' -x 'STATUS' \
+        --addprefix="${prefix}/" > ${this}
+    next=`mktemp /tmp/pullrevXXXXXX`
+    combinediff --quiet ${prev} ${this} > ${next}
+    rm -f "${this}"
+    [ "${prev}" = "/dev/null" ] || rm -f "${prev}"
+    prev=${next}
+done
+
+cat ${prev} >> ${fn}
+
+vi "${fn}"
+echo "+ git add ${fn}" 
+git add "${fn}"
+echo "+ spec template:"
+echo "PatchN: ${fn}"
+echo "%patchN -p1 -b .${suffix}"

sources

@@ -1 +1 @@
-SHA512 (subversion-1.10.6.tar.bz2) = a4f80e1baf04ba62290fdff9d22ee12f65103edc72b42f5827d3bb0110bd2cae0f89ad95cddfd5862b2efbffa6639240f26d8412731534f6f40ab2f1915fc9ef
+SHA512 (subversion-1.14.2.tar.bz2) = 20ada4688ca07d9fb8da4b7d53b5084568652a3b9418c65e688886bae950a16a3ff37710fcfc9c29ef14a89e75b2ceec4e9cf35d5876a7896ebc2b512cfb9ecc

subversion-1.10.0-pie.patch

@@ -1,72 +0,0 @@
-
-Link executables using -pie, link test executables using -no-install.
-
-diff -uap subversion-1.10.0/build.conf.pie subversion-1.10.0/build.conf
---- subversion-1.10.0/build.conf.pie
-+++ subversion-1.10.0/build.conf
-@@ -783,6 +783,7 @@
- libs = libsvn_repos libsvn_fs libsvn_delta libsvn_subr aprutil apriconv apr
- msvc-static = yes
- undefined-lib-symbols = yes
-+link-cmd = $(LINK_TEST_LIB)
- 
- # ----------------------------------------------------------------------------
- # Tests for libsvn_fs_base
-diff -uap subversion-1.10.0/build/generator/gen_base.py.pie subversion-1.10.0/build/generator/gen_base.py
---- subversion-1.10.0/build/generator/gen_base.py.pie
-+++ subversion-1.10.0/build/generator/gen_base.py
-@@ -599,7 +599,7 @@
-     self.install = options.get('install')
-     self.compile_cmd = options.get('compile-cmd')
-     self.sources = options.get('sources', '*.c *.cpp')
--    self.link_cmd = options.get('link-cmd', '$(LINK)')
-+    self.link_cmd = options.get('link-cmd', '$(LINK_LIB)')
- 
-     self.external_lib = options.get('external-lib')
-     self.external_project = options.get('external-project')
-@@ -659,6 +659,17 @@
- 
-     self.msvc_force_static = options.get('msvc-force-static') == 'yes'
- 
-+    if self.install in ['test', 'bdb-test', 'sub-test', ]:
-+      self.link_cmd = '$(LINK_TEST)'
-+    elif self.install in ['cxxhl-tests', ]:
-+      self.link_cmd = '$(LINK_TEST_CXX)'
-+    elif self.link_cmd == '$(LINK_LIB)':
-+      # Over-ride the default for TargetLinked.
-+      self.link_cmd = '$(LINK_EXE)'
-+    else:
-+      raise GenError('ERROR: Unknown executable link type for ' + self.name + \
-+                     ': ' + self.link_cmd + ' (' + self.install + ')')
-+    
-   def add_dependencies(self):
-     TargetLinked.add_dependencies(self)
- 
-diff -uap subversion-1.10.0/Makefile.in.pie subversion-1.10.0/Makefile.in
---- subversion-1.10.0/Makefile.in.pie
-+++ subversion-1.10.0/Makefile.in
-@@ -268,6 +268,11 @@
- LINK_LIB = $(LINK) $(LT_SO_VERSION) -rpath $(libdir)
- LINK_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=link $(CXX) $(LT_LDFLAGS) $(CXXFLAGS) $(LDFLAGS)
- LINK_CXX_LIB = $(LINK_CXX) $(LT_SO_VERSION) -rpath $(libdir)
-+LINK_TEST = $(LINK) -no-install
-+LINK_TEST_LIB = $(LINK) -avoid-version
-+LINK_TEST_CXX_LIB = $(LINK_CXX) -avoid-version
-+LINK_EXE = $(LINK) -pie
-+LINK_CXX_EXE = $(LINK) -pie
- 
- # special link rule for mod_dav_svn
- LINK_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(APACHE_LIBEXECDIR) -avoid-version -module $(APACHE_LDFLAGS) -shared
-@@ -780,10 +785,10 @@
- 	$(PYTHON) $(top_srcdir)/build/transform_sql.py $< $(top_srcdir)/$@
- 
- .c.o:
--	$(COMPILE) -o $@ -c $<
-+	$(COMPILE) -fPIE -o $@ -c $<
- 
- .cpp.o:
--	$(COMPILE_CXX) -o $@ -c $<
-+	$(COMPILE_CXX) -fPIE -o $@ -c $<
- 
- .c.lo:
- 	$(LT_COMPILE) -o $@ -c $<

subversion-1.10.0-rpath.patch

@@ -1,42 +0,0 @@
-
-Only link libraries using -rpath, to avoid unnecessary RPATH tags in executables.
-
-diff -uap subversion-1.10.0/build.conf.rpath subversion-1.10.0/build.conf
---- subversion-1.10.0/build.conf.rpath
-+++ subversion-1.10.0/build.conf
-@@ -568,7 +568,7 @@
- path = subversion/bindings/swig/python/libsvn_swig_py
- libs = libsvn_client libsvn_wc libsvn_ra libsvn_delta libsvn_subr
-        apriconv apr python swig
--link-cmd = $(LINK)
-+link-cmd = $(LINK_LIB)
- install = swig-py-lib
- # need special build rule to include -DSWIGPYTHON
- compile-cmd = $(COMPILE_SWIG_PY)
-@@ -594,7 +594,7 @@
- lang = ruby
- path = subversion/bindings/swig/ruby/libsvn_swig_ruby
- libs = libsvn_client libsvn_wc libsvn_delta libsvn_subr apriconv apr ruby swig
--link-cmd = $(LINK) $(SWIG_RB_LIBS)
-+link-cmd = $(LINK_LIB) $(SWIG_RB_LIBS)
- install = swig-rb-lib
- # need special build rule to include
- compile-cmd = $(COMPILE_SWIG_RB)
-diff -uap subversion-1.10.0/Makefile.in.rpath subversion-1.10.0/Makefile.in
---- subversion-1.10.0/Makefile.in.rpath
-+++ subversion-1.10.0/Makefile.in
-@@ -264,10 +264,10 @@
- COMPILE_GOOGLEMOCK_CXX = $(LT_COMPILE_CXX_NOWARN) $(GOOGLEMOCK_LIB_INCLUDES) -o $@ -c
- COMPILE_CXXHL_GOOGLEMOCK_CXX = $(LT_COMPILE_CXX) $(CXXHL_INCLUDES) $(GOOGLEMOCK_INCLUDES) -o $@ -c
- 
--LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(libdir)
--LINK_LIB = $(LINK) $(LT_SO_VERSION)
--LINK_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=link $(CXX) $(LT_LDFLAGS) $(CXXFLAGS) $(LDFLAGS) -rpath $(libdir)
--LINK_CXX_LIB = $(LINK_CXX) $(LT_SO_VERSION)
-+LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS)
-+LINK_LIB = $(LINK) $(LT_SO_VERSION) -rpath $(libdir)
-+LINK_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=link $(CXX) $(LT_LDFLAGS) $(CXXFLAGS) $(LDFLAGS)
-+LINK_CXX_LIB = $(LINK_CXX) $(LT_SO_VERSION) -rpath $(libdir)
- 
- # special link rule for mod_dav_svn
- LINK_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(APACHE_LIBEXECDIR) -avoid-version -module $(APACHE_LDFLAGS) -shared

subversion-1.12.0-linking.patch

@@ -0,0 +1,84 @@
+
+Fix the way libtool is used to match standard practice:
+
+a) link ONLY libraries using -rpath $(libdir), not executables
+   .. this avoids adding an RPATH for $libdir to executables
+b) link non-installable test binaries using -no-install
+   .. only for convenience but should speed up builds slightly(?)
+
+--- subversion-1.12.0/build.conf.linking
++++ subversion-1.12.0/build.conf
+@@ -572,7 +572,7 @@
+ path = subversion/bindings/swig/python/libsvn_swig_py
+ libs = libsvn_client libsvn_wc libsvn_ra libsvn_delta libsvn_subr
+        apriconv apr python swig
+-link-cmd = $(LINK)
++link-cmd = $(LINK_LIB)
+ install = swig-py-lib
+ # need special build rule to include -DSWIGPYTHON
+ compile-cmd = $(COMPILE_SWIG_PY)
+@@ -598,7 +598,7 @@
+ lang = ruby
+ path = subversion/bindings/swig/ruby/libsvn_swig_ruby
+ libs = libsvn_client libsvn_wc libsvn_delta libsvn_subr apriconv apr ruby swig
+-link-cmd = $(LINK) $(SWIG_RB_LIBS)
++link-cmd = $(LINK_LIB) $(SWIG_RB_LIBS)
+ install = swig-rb-lib
+ # need special build rule to include
+ compile-cmd = $(COMPILE_SWIG_RB)
+@@ -769,6 +769,7 @@
+ libs = libsvn_repos libsvn_fs libsvn_delta libsvn_subr aprutil apriconv apr
+ msvc-static = yes
+ undefined-lib-symbols = yes
++link-cmd = $(LINK_TEST_LIB)
+ 
+ # ----------------------------------------------------------------------------
+ # Tests for libsvn_fs_base
+--- subversion-1.12.0/build/generator/gen_base.py.linking
++++ subversion-1.12.0/build/generator/gen_base.py
+@@ -599,7 +599,7 @@
+     self.install = options.get('install')
+     self.compile_cmd = options.get('compile-cmd')
+     self.sources = options.get('sources', '*.c *.cpp')
+-    self.link_cmd = options.get('link-cmd', '$(LINK)')
++    self.link_cmd = options.get('link-cmd', '$(LINK_LIB)')
+ 
+     self.external_lib = options.get('external-lib')
+     self.external_project = options.get('external-project')
+@@ -659,6 +659,14 @@
+ 
+     self.msvc_force_static = options.get('msvc-force-static') == 'yes'
+ 
++    if self.install in ['test', 'bdb-test', 'sub-test', ]:
++      self.link_cmd = '$(LINK_TEST)'
++    elif self.install in ['bin', 'tools']:
++      self.link_cmd = '$(LINK_EXE)'
++    elif self.link_cmd == '$(LINK_LIB)':
++      raise GenError('ERROR: Unknown executable link type for ' + self.name + \
++                     ': ' + self.link_cmd + ' (' + self.install + ')')
++    
+   def add_dependencies(self):
+     TargetLinked.add_dependencies(self)
+ 
+--- subversion-1.12.0/Makefile.in.linking
++++ subversion-1.12.0/Makefile.in
+@@ -268,11 +268,14 @@
+ COMPILE_SVNXX = $(LT_COMPILE_CXX) $(SVNXX_INCLUDES) -o $@ -c
+ COMPILE_SVNXX_TEST = $(LT_COMPILE_CXX) $(SVNXX_INCLUDES) $(BOOST_TEST_CPPFLAGS) -o $@ -c
+ 
+-LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(libdir)
+-LINK_LIB = $(LINK) $(LT_SO_VERSION)
+-LINK_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=link $(CXX) $(LT_LDFLAGS) $(CXXFLAGS) $(LDFLAGS) -rpath $(libdir)
+-LINK_CXX_LIB = $(LINK_CXX) $(LT_SO_VERSION)
+-LINK_SVNXX_TEST = $(LINK_CXX) $(BOOST_TEST_LDFLAGS)
++LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS)
++LINK_LIB = $(LINK) $(LT_SO_VERSION) -rpath $(libdir)
++LINK_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=link $(CXX) $(LT_LDFLAGS) $(CXXFLAGS) $(LDFLAGS)
++LINK_CXX_LIB = $(LINK_CXX) $(LT_SO_VERSION) -rpath $(libdir)
++LINK_SVNXX_TEST = $(LINK_CXX) $(BOOST_TEST_LDFLAGS) -no-install
++LINK_TEST = $(LINK) -no-install
++LINK_TEST_LIB = $(LINK_TEST) -avoid-version
++LINK_EXE = $(LINK)
+ 
+ # special link rule for mod_dav_svn
+ LINK_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(APACHE_LIBEXECDIR) -avoid-version -module $(APACHE_LDFLAGS) -shared

subversion-1.14.0-testwarn.patch

@@ -0,0 +1,14 @@
+
+Suppress gcc 10 warning.
+
+--- subversion-1.14.0/subversion/tests/svn_test.h.testwarn
++++ subversion-1.14.0/subversion/tests/svn_test.h
+@@ -128,7 +128,7 @@
+       return svn_error_createf(SVN_ERR_TEST_FAILED, NULL,           \
+           "Strings not equal\n  Expected: '%s'\n  Found:    '%s'"   \
+           "\n  at %s:%d",                                           \
+-          tst_str2, tst_str1, __FILE__, __LINE__);                  \
++          tst_str2 ? tst_str2 : "(NULL)", tst_str1 ? tst_str1 : "(NULL)", __FILE__, __LINE__); \
+   } while(0)
+ 
+  /** Handy macro for testing integer equality.

subversion-1.14.1-fixjavatests.patch

@@ -0,0 +1,30 @@
+
+See upstream dev@subversion thread.  Fixes intermittent failure of
+javahl tests, particularly reproducible on aarch64.
+
+Message-ID: <11de5f5c-5059-b973-95a1-385e7913a63a@syntevo.com>
+From: Alexandr Miloslavskiy
+
+--- subversion-1.14.1/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java.fixjavatests
++++ subversion-1.14.1/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
+@@ -4676,7 +4676,19 @@
+             // RuntimeException("Test exception") is expected here
+         }
+ 
+-        tunnelAgent.joinAndTest();
++        // In this test, there is a race condition that sometimes results in
++        // IOException when 'WAIT_TUNNEL' tries to read from a pipe that
++        // already has its read end closed. This is not an error, but
++        // it's hard to distinguish this case from other IOException which
++        // indicate a problem. To reproduce, simply wrap this test's body in
++        // a loop. The workaround is to ignore any detected IOException.
++        //
++        // tunnelAgent.joinAndTest();
++        try {
++            tunnelAgent.join();
++        } catch (InterruptedException e) {
++            e.printStackTrace ();
++        }
+     }
+ 
+     /**

subversion-1.14.1-python-3.11-build.patch

@@ -0,0 +1,14 @@
+Use read_file instead of deprecated readfp  - removed in Python 3.11 
+
+diff -ur subversion-1.14.1/build/generator/gen_base.py subversion-1.14.1-patched/build/generator/gen_base.py
+--- subversion-1.14.1/build/generator/gen_base.py	2019-11-04 06:59:36.000000000 +0100
++++ subversion-1.14.1-patched/build/generator/gen_base.py	2021-12-15 14:04:50.041649320 +0100
+@@ -76,7 +76,7 @@
+ 
+     # Now read and parse build.conf
+     parser = configparser.ConfigParser()
+-    parser.readfp(open(fname))
++    parser.read_file(open(fname))
+ 
+     self.conf = build_path(os.path.abspath(fname))
+ 

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 += """

subversion-1.14.2-soversion.patch

@@ -0,0 +1,23 @@
+
+Subversion libraries don't get properly versioned so the library
+names are always "libsvn_foo-1.so.0.0.0". Provide proper 
+versioning information to libtool *without* changing the soname
+for compatibility with upstream, so on-disk filenames are
+unique across different releases.
+
+--- subversion-1.14.2/configure.ac.soversion
++++ subversion-1.14.2/configure.ac
+@@ -112,7 +112,12 @@
+   SVN_APR_MAJOR_VERSION=1
+ fi
+ AC_SUBST(SVN_APR_MAJOR_VERSION)
+-SVN_LT_SOVERSION="-version-info $svn_lib_ver"
++
++m4_define([svn_ver_minor], m4_bpatsubst(AC_PACKAGE_VERSION, [[0-9]*\.\([0-9]*\)\.[0-9]*], [\1]))
++m4_define([svn_ver_patch], m4_bpatsubst(AC_PACKAGE_VERSION, [[0-9]*\.[0-9]*\.\([0-9]*\)], [\1]))
++svn_ver_current="`expr $svn_lib_ver + svn_ver_minor`"
++
++SVN_LT_SOVERSION="-version-info $svn_ver_current:svn_ver_patch:svn_ver_minor"
+ AC_SUBST(SVN_LT_SOVERSION)
+ AC_DEFINE_UNQUOTED(SVN_SOVERSION, $svn_lib_ver,
+                    [Subversion library major verson])

subversion.spec

@@ -1,16 +1,38 @@
-# set to zero to avoid running test suite
+# Disable to avoid all the test suites
+%bcond_without tests
 
+# Disable automatic .la file removal
+%global __brp_remove_la_files %nil
+
+%if 0%{?rhel} || 0%{?eln}
+%bcond_with kwallet
+%else
 %bcond_without kwallet
+%endif
+
+%if 0%{?fedora} > 32 || 0%{?rhel} > 8
+%bcond_with bdb
+%else
+%bcond_without bdb
+%endif
+
+# Python 2 for F<32, Python 3 for F>=32 and RHEL>=9
+%if 0%{?fedora} < 32 && 0%{?rhel} < 9
 %bcond_without python2
 %bcond_with python3
-%bcond_without bdb
-%bcond_without tests
 %bcond_without pyswig
-
-%ifarch %{power64} s390x
-%global with_java 0
+%bcond_without ruby
 %else
-%global with_java 1
+%bcond_with python2
+%bcond_without python3
+%bcond_without pyswig
+%bcond_without ruby
+%endif
+
+%ifarch %{java_arches}
+%bcond_without java
+%else
+%bcond_with java
 %endif
 
 %if %{with python2} == %{with python3}
@@ -36,13 +58,11 @@
 
 Summary: A Modern Concurrent Version Control System
 Name: subversion
-Version: 1.10.6
-Release: 1%{?dist}
+Version: 1.14.2
+Release: 7%{?dist}
 License: ASL 2.0
-Group: Development/Tools
 URL: https://subversion.apache.org/
-
-Source0: https://www.apache.org/dist/subversion/subversion-%{version}.tar.bz2
+Source0: https://downloads.apache.org/subversion/subversion-%{version}.tar.bz2
 Source1: subversion.conf
 Source3: filter-requires.sh
 Source4: http://www.xsteve.at/prg/emacs/psvn.el
@@ -50,17 +70,22 @@ Source5: psvn-init.el
 Source6: svnserve.service
 Source7: svnserve.tmpfiles
 Source8: svnserve.sysconf
-Patch1: subversion-1.10.0-rpath.patch
-Patch2: subversion-1.10.0-pie.patch
+Patch1: subversion-1.12.0-linking.patch
+Patch2: subversion-1.14.0-testwarn.patch
+Patch3: subversion-1.14.2-soversion.patch
 Patch4: subversion-1.8.0-rubybind.patch
 Patch5: subversion-1.8.5-swigplWall.patch
-BuildRequires: autoconf, libtool, texinfo, which
+Patch6: subversion-1.14.1-testnomagic.patch
+Patch8: subversion-1.14.1-python-3.11-build.patch
+
+BuildRequires: make
+BuildRequires: autoconf, libtool, texinfo, which, gcc, gcc-c++
 BuildRequires: swig >= 1.3.24, gettext
 %if %{with bdb}
 BuildRequires: libdb-devel >= 4.1.25
 %endif
 BuildRequires: %{svn_python_br}
-BuildRequires: apr-devel >= 1.3.0, apr-util-devel >= 1.3.0
+BuildRequires: apr-devel >= 1.5.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
@@ -87,10 +112,9 @@ instead of every complete file.  Subversion is intended to be a
 compelling replacement for CVS.
 
 %package libs
-Group: Development/Tools
 Summary: Libraries for Subversion Version Control system
 # APR 1.3.x interfaces are required
-Conflicts: apr%{?_isa} < 1.3.0
+Conflicts: apr%{?_isa} < 1.5.0
 # Enforced at run-time by ra_serf
 Conflicts: libserf%{?_isa} < 1.3.0
 
@@ -106,7 +130,6 @@ Provides: %{name}-python = %{version}-%{release}
 Provides: %{name}-python%{?_isa} = %{version}-%{release}
 Obsoletes: %{name}-python < %{version}-%{release}
 BuildRequires: python2-devel
-Group: Development/Libraries
 Summary: Python bindings for Subversion Version Control system
 
 %description -n python2-subversion
@@ -116,9 +139,9 @@ Subversion libraries.
 %if %{with python3} && %{with pyswig}
 %package -n python3-subversion
 %{?python_provide:%python_provide python3-subversion}
-Group: Development/Libraries
 Summary: Python bindings for Subversion Version Control system
-BuildRequires: python3-devel
+BuildRequires: python3-devel py3c-devel
+Requires: subversion-libs%{?_isa} = %{version}-%{release}
 
 %description -n python3-subversion
 The python3-subversion package includes the Python 3.x bindings to the
@@ -126,9 +149,8 @@ Subversion libraries.
 %endif
 
 %package devel
-Group: Development/Tools
 Summary: Development package for the Subversion libraries
-Requires: subversion%{?_isa} = %{version}-%{release}
+Requires: subversion-libs%{?_isa} = %{version}-%{release}
 Requires: apr-devel%{?_isa}, apr-util-devel%{?_isa}
 
 %description devel
@@ -136,9 +158,8 @@ The subversion-devel package includes the libraries and include files
 for developers interacting with the subversion package.
 
 %package gnome
-Group: Development/Tools
 Summary: GNOME Keyring support for Subversion
-Requires: subversion%{?_isa} = %{version}-%{release}
+Requires: subversion-libs%{?_isa} = %{version}-%{release}
 BuildRequires: dbus-devel, libsecret-devel
 
 %description gnome
@@ -147,10 +168,10 @@ passwords in the GNOME Keyring.
 
 %if %{with kwallet}
 %package kde
-Group: Development/Tools
 Summary: KDE Wallet support for Subversion
-Requires: subversion%{?_isa} = %{version}-%{release}
-BuildRequires: kdelibs-devel >= 4.0.0
+Requires: subversion-libs%{?_isa} = %{version}-%{release}
+BuildRequires: qt5-qtbase-devel >= 5.0.0, kf5-kwallet-devel, kf5-ki18n-devel
+BuildRequires: kf5-kcoreaddons-devel
 
 %description kde
 The subversion-kde package adds support for storing Subversion
@@ -158,7 +179,6 @@ passwords in the KDE Wallet.
 %endif
 
 %package -n mod_dav_svn
-Group: System Environment/Daemons
 Summary: Apache httpd module for Subversion server
 Requires: httpd-mmn = %{_httpd_mmn}
 Requires: subversion-libs%{?_isa} = %{version}-%{release}
@@ -169,22 +189,20 @@ The mod_dav_svn package allows access to a Subversion repository
 using HTTP, via the Apache httpd server.
 
 %package perl
-Group: Development/Libraries
 Summary: Perl bindings to the Subversion libraries
 BuildRequires: perl-devel >= 2:5.8.0, perl-generators, perl(ExtUtils::MakeMaker)
 BuildRequires: perl(Test::More), perl(ExtUtils::Embed)
 Requires: %(eval `perl -V:version`; echo "perl(:MODULE_COMPAT_$version)")
-Requires: subversion%{?_isa} = %{version}-%{release}
+Requires: subversion-libs%{?_isa} = %{version}-%{release}
 
 %description perl
 This package includes the Perl bindings to the Subversion libraries.
 
-%if %{with_java}
+%if %{with java}
 %package javahl
-Group: Development/Libraries
 Summary: JNI bindings to the Subversion libraries
 Requires: subversion = %{version}-%{release}
-BuildRequires: java-devel-openjdk
+BuildRequires: java-17-openjdk-devel
 # JAR repacking requires both zip and unzip in the buildroot
 BuildRequires: zip, unzip
 # For the tests
@@ -195,42 +213,56 @@ BuildArch: noarch
 This package includes the JNI bindings to the Subversion libraries.
 %endif
 
+%if %{with ruby}
 %package ruby
-Group: Development/Libraries
 Summary: Ruby bindings to the Subversion libraries
 BuildRequires: ruby-devel >= 1.9.1, ruby >= 1.9.1
 BuildRequires: rubygem(test-unit)
-Requires: subversion%{?_isa} = %{version}-%{release}
+Requires: subversion-libs%{?_isa} = %{version}-%{release}
 Conflicts: ruby-libs%{?_isa} < 1.8.2
 
 %description ruby
 This package includes the Ruby bindings to the Subversion libraries.
+%endif
 
 %package tools
-Group: Development/Tools
 Summary: Supplementary tools for Subversion
-Requires: subversion%{?_isa} = %{version}-%{release}
+Requires: subversion-libs%{?_isa} = %{version}-%{release}
 
 %description tools
 This package includes supplementary tools for use with Subversion.
 
 %prep
 %setup -q
-%patch1 -p1 -b .rpath
-%patch2 -p1 -b .pie
+%patch1 -p1 -b .linking
+%patch2 -p1 -b .testwarn
+%patch3 -p1 -b .soversion
 %patch4 -p1 -b .rubybind
 %patch5 -p1 -b .swigplWall
+%patch6 -p1 -b .testnomagic
+%patch8 -p1 -b .pythonbuild
+
+:
+: === Building:
+: === Python3=%{with python3} Python2=%{with python2} PySwig=%{with pyswig}
+: === Java=%{with java} Ruby=%{with ruby}
+: === BDB=%{with bdb} Tests=%{with tests} KWallet=%{with kwallet}
+:
 
 %build
-# Regenerate the buildsystem, so that:
-#  1) patches applied to configure.in take effect
-#  2) the swig bindings are regenerated using the system swig
-# (2) is not ideal since typically upstream test with a different
-# swig version
-# This PATH order makes the fugly test for libtoolize work...
+# Regenerate the buildsystem, so that any patches applied to
+# configure, swig bindings etc take effect.
 mv build-outputs.mk build-outputs.mk.old
 export PYTHON=%{svn_python}
 
+### Force regeneration of swig bindings with the buildroot's SWIG.
+# Generated files depend on the build/generator/swig/*.py which
+# generates them, so when autogen-standalone.mk's autogen-swig target
+# is run by autogen.sh it will regenerate them:
+touch build/generator/swig/*.py
+
+### Regenerate everything:
+# This PATH order makes the fugly test for libtoolize work...
 PATH=/usr/bin:$PATH ./autogen.sh --release
 
 # fix shebang lines, #111498
@@ -242,6 +274,10 @@ perl -pi -e 's|/usr/bin/env python.*|%{svn_python}|' subversion/tests/cmdline/sv
 export svn_cv_ruby_link="%{__cc} -shared"
 export svn_cv_ruby_sitedir_libsuffix=""
 export svn_cv_ruby_sitedir_archsuffix=""
+%if 0%{?fedora} >= 32 || 0%{?rhel} >= 9
+# Fix include path for ruby2.7
+export svn_cv_ruby_includes="-I%{_includedir}"
+%endif
 
 #export EXTRA_CFLAGS="$RPM_OPT_FLAGS -DSVN_SQLITE_MIN_VERSION_NUMBER=3007012 \
 #       -DSVN_SQLITE_MIN_VERSION=\\\"3.7.12\\\""
@@ -258,12 +294,12 @@ export CC=gcc CXX=g++ JAVA_HOME=%{jdk_path}
         --disable-static --with-sasl=%{_prefix} \
         --with-libmagic=%{_prefix} \
         --with-gnome-keyring \
-%if %{with_java}
+%if %{with java}
         --enable-javahl \
         --with-junit=%{_prefix}/share/java/junit.jar \
 %endif
 %if %{with kwallet}
-        --with-kwallet=%{_includedir}/kde4:%{_libdir}/kde4/devel \
+        --with-kwallet=%{_includedir}:%{_libdir} \
 %endif
 %if %{with bdb}
         --with-berkeley-db \
@@ -275,8 +311,11 @@ make %{?_smp_mflags} all tools
 %if %{with pyswig}
 make swig-py swig-py-lib %{swigdirs}
 %endif
-make swig-pl swig-pl-lib swig-rb swig-rb-lib
-%if %{with_java}
+make swig-pl swig-pl-lib
+%if %{with ruby}
+make swig-rb swig-rb-lib
+%endif
+%if %{with java}
 # javahl-javah does not parallel-make with javahl
 #make javahl-java javahl-javah
 make javahl
@@ -290,7 +329,7 @@ make install-swig-py %{swigdirs} DESTDIR=$RPM_BUILD_ROOT
 make install-swig-pl-lib install-swig-rb DESTDIR=$RPM_BUILD_ROOT
 make pure_vendor_install -C subversion/bindings/swig/perl/native \
         PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
-%if %{with_java}
+%if %{with java}
 make install-javahl-java install-javahl-lib javahl_javadir=%{_javadir} DESTDIR=$RPM_BUILD_ROOT
 %endif
 
@@ -356,6 +395,9 @@ sed -i "/^dependency_libs/{
      s,%{_libdir}/lib[^a][^p][^r][^ ']*.la, ,g;
      }"  $RPM_BUILD_ROOT%{_libdir}/*.la
 
+# Trim libdir in pkgconfig files to avoid multilib conflicts
+sed -i '/^libdir=/d' $RPM_BUILD_ROOT%{_datadir}/pkgconfig/libsvn*.pc
+
 # Install bash completion
 install -Dpm 644 tools/client-side/bash_completion \
         $RPM_BUILD_ROOT%{_datadir}/bash-completion/completions/svn
@@ -425,7 +467,7 @@ if ! make check-swig-py; then
 fi
 %endif
 # check-swig-rb omitted: it runs svnserve
-%if %{with_java}
+%if %{with java}
 make check-javahl
 %endif
 %endif
@@ -439,22 +481,14 @@ make check-javahl
 %postun
 %systemd_postun_with_restart svnserve.service
 
-%post libs -p /sbin/ldconfig
+%ldconfig_scriptlets libs
 
-%postun libs -p /sbin/ldconfig
+%ldconfig_scriptlets perl
 
-%post perl -p /sbin/ldconfig
+%ldconfig_scriptlets ruby
 
-%postun perl -p /sbin/ldconfig
-
-%post ruby -p /sbin/ldconfig
-
-%postun ruby -p /sbin/ldconfig
-
-%if %{with_java}
-%post javahl -p /sbin/ldconfig
-
-%postun javahl -p /sbin/ldconfig
+%if %{with java}
+%ldconfig_scriptlets javahl
 %endif
 
 %files -f %{name}.files
@@ -475,7 +509,10 @@ make check-javahl
 %{_prefix}/lib/tmpfiles.d/svnserve.conf
 
 %files tools -f tools.files
-%doc tools/hook-scripts tools/backup tools/bdb tools/examples tools/xslt
+%doc tools/hook-scripts tools/backup tools/examples tools/xslt
+%if %{with bdb}
+%doc tools/bdb
+%endif
 
 %files libs
 %{!?_licensedir:%global license %%doc}
@@ -483,7 +520,7 @@ make check-javahl
 %{_libdir}/libsvn*.so.*
 %exclude %{_libdir}/libsvn_swig_perl*
 %exclude %{_libdir}/libsvn_swig_ruby*
-%if %{with_java}
+%if %{with java}
 %{_libdir}/libsvnjavahl-*.so
 %endif
 %if %{with kwallet}
@@ -532,25 +569,169 @@ make check-javahl
 %{_libdir}/libsvn_swig_perl*
 %{_mandir}/man*/*::*
 
+%if %{with ruby}
 %files ruby
 %{_libdir}/libsvn_swig_ruby*
 %{ruby_vendorarchdir}/svn
+%endif
 
-%if %{with_java}
+%if %{with java}
 %files javahl
 %{_javadir}/svn-javahl.jar
 %endif
 
 %changelog
-* Thu Jul 25 2019 Joe Orton <jorton@redhat.com> - 1.10.6-1
-- update to 1.10.6
+* Fri Jul 29 2022 Joe Orton <jorton@redhat.com> - 1.14.2-7
+- improve library versioning so filenames are unique across releases
 
-* Fri May 24 2019 Joe Orton <jorton@redhat.com> - 1.10.4-1
-- update to 1.10.4
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.14.2-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 
-* Fri May 24 2019 Joe Orton <jorton@redhat.com> - 1.10.3-2
+* 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)
+
+* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 1.14.2-3
+- Rebuilt for Python 3.11
+
+* Tue May 31 2022 Jitka Plesnikova <jplesnik@redhat.com> - 1.14.2-2
+- Perl 5.36 rebuild
+
+* Wed May  4 2022 Joe Orton <jorton@redhat.com> - 1.14.2-1
+- update to 1.14.2 (#2073852, CVE-2021-28544, CVE-2022-24070)
+
+* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 1.14.1-11
+- Rebuilt for java-17-openjdk as system jdk
+
+* Thu Jan 27 2022 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.14.1-10
+- F-36: rebuild against ruby31
+
+* Mon Jan 24 2022 Timm Bäder <tbaeder@redhat.com> - 1.14.1-9
+- Disable automatic .la file removal
+- https://fedoraproject.org/wiki/Changes/RemoveLaFiles
+
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.14.1-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Thu Dec 16 2021 Richard Lescak <rlescak@redhat.com> - 1.14.1-7
+- Replaced deprecated method readfp() in gen_base.py to build with Python 3.11 (#2019019)
+
+* Thu Jul 29 2021 Joe Orton <jorton@redhat.com> - 1.14.1-6
+- fix intermittent FTBFS in tests (#1956806)
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.14.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 1.14.1-4
+- Rebuilt for Python 3.10
+
+* Sat May 22 2021 Jitka Plesnikova <jplesnik@redhat.com> - 1.14.1-3
+- Perl 5.34 rebuild
+
+* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.14.1-2
+- Rebuilt for updated systemd-rpm-macros
+  See https://pagure.io/fesco/issue/2583.
+
+* Wed Feb 10 2021 Joe Orton <jorton@redhat.com> - 1.14.1-1
+- update to 1.14.1 (#1927265, #1768698)
+
+* 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
+- 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++
+
+* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.14.0-6
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.14.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue Jun 23 2020 Jitka Plesnikova <jplesnik@redhat.com> - 1.14.0-4
+- Perl 5.32 rebuild
+
+* Wed Jun  3 2020 Merlin Mathesius <mmathesi@redhat.com> - 1.14.0-3
+- Minor conditional fixes for ELN
+
+* Wed Jun  3 2020 Joe Orton <jorton@redhat.com> - 1.14.0-2
+- use minor version as libtool library revision number
+
+* Mon Jun  1 2020 Joe Orton <jorton@redhat.com> - 1.14.0-1
+- update to 1.14.0 (#1840565, #1812195)
+
+* Tue May 19 2020 Joe Orton <jorton@redhat.com> - 1.14.0~rc2-2
+- switch subpackages to lock-step requires on -libs rather than subversion
+- fixed the build-requires (Jitka Plesnikova)
+
+* Thu Apr 30 2020 Joe Orton <jorton@redhat.com> - 1.14.0~rc2-1
+- drop Berkeley DB support for Fedora > 32
+- BR java-11-openjdk-devel
+
+* Thu Apr 23 2020 Joe Orton <jorton@redhat.com> - 1.14.0~rc2-0
+- update to 1.14.0-rc2
+
+* Wed Feb 12 2020 Joe Orton <jorton@redhat.com> - 1.13.0-4
+- fix FTBFS on 32-bit arches (#1800120)
+- conditionally package bdb tools in -tools
+
+* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Tue Jan 21 2020 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.12.2-4
+- F-32: fix include path for ruby 2.7
+- Rebuild for ruby 2.7
+
+* Mon Jan  6 2020 Joe Orton <jorton@redhat.com> - 1.12.2-3
+- update for KDE 5 (Phil O, #1768693)
+
+* Fri Aug 30 2019 Joe Orton <jorton@redhat.com> - 1.12.2-2
+- switch to Python 3 for F32+ (#1737928)
+
+* Thu Jul 25 2019 Joe Orton <jorton@redhat.com> - 1.12.2-1
+- update to 1.12.2
+
+* Sat Jun 01 2019 Jitka Plesnikova <jplesnik@redhat.com> - 1.12.0-2
+- Perl 5.30 rebuild
+
+* Wed May  1 2019 Joe Orton <jorton@redhat.com> - 1.12.0-1
+- update to 1.12.0 (#1702471)
+
+* Wed Apr 17 2019 Joe Orton <jorton@redhat.com> - 1.11.1-5
 - fix build with APR 1.7.0 (upstream r1857391)
 
+* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.11.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Mon Jan 21 2019 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.11.1-3
+- F-30: rebuild against ruby26
+
+* Mon Jan 14 2019 Björn Esser <besser82@fedoraproject.org> - 1.11.1-2
+- Rebuilt for libcrypt.so.2 (#1666033)
+
+* Fri Jan 11 2019 Joe Orton <jorton@redhat.com> - 1.11.1-1
+- update to 1.11.1
+
+* Wed Oct 31 2018 Joe Orton <jorton@redhat.com> - 1.11.0-1
+- update to 1.11.0
+
 * Thu Oct 11 2018 Joe Orton <jorton@redhat.com> - 1.10.3-1
 - update to 1.10.3