From 620cccab98514b0351d47fe0b9d9d4dc2e5df3bb Mon Sep 17 00:00:00 2001
From: Joe Orton <jorton@redhat.com>
Date: Jun 03 2020 09:03:10 +0000
Subject: use minor version as libtool library revision number


---

diff --git a/subversion-1.14.0-soversion.patch b/subversion-1.14.0-soversion.patch
new file mode 100644
index 0000000..02fe0b4
--- /dev/null
+++ b/subversion-1.14.0-soversion.patch
@@ -0,0 +1,19 @@
+
+Use the minor version as the revision in the libtool version, so the library
+soversion is not always 0.0.0.  (Does not influence the soname)
+
+--- subversion-1.14.0/configure.ac.soversion
++++ subversion-1.14.0/configure.ac
+@@ -112,7 +112,11 @@
+   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]))
++
++SVN_LT_SOVERSION="-version-info $svn_lib_ver:svn_ver_minor"
++AC_MSG_NOTICE([SVN_LT_SOVERSION $SVN_LT_SOVERSION])
+ AC_SUBST(SVN_LT_SOVERSION)
+ AC_DEFINE_UNQUOTED(SVN_SOVERSION, $svn_lib_ver,
+                    [Subversion library major verson])
diff --git a/subversion.spec b/subversion.spec
index cb52d2e..44e6bc1 100644
--- a/subversion.spec
+++ b/subversion.spec
@@ -52,7 +52,7 @@
 Summary: A Modern Concurrent Version Control System
 Name: subversion
 Version: 1.14.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: ASL 2.0
 URL: https://subversion.apache.org/
 
@@ -66,6 +66,7 @@ Source7: svnserve.tmpfiles
 Source8: svnserve.sysconf
 Patch1: subversion-1.12.0-linking.patch
 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
 BuildRequires: autoconf, libtool, texinfo, which
@@ -224,6 +225,7 @@ This package includes supplementary tools for use with Subversion.
 %setup -q
 %patch1 -p1 -b .linking
 %patch2 -p1 -b .testwarn
+%patch3 -p1 -b .soversion
 %patch4 -p1 -b .rubybind
 %patch5 -p1 -b .swigplWall
 
@@ -563,6 +565,9 @@ make check-javahl
 %endif
 
 %changelog
+* 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)