update to 1.10.6

sources

@@ -1 +1 @@
-SHA512 (subversion-1.10.4.tar.bz2) = c44a4a4a9533cd4f4cb6ddbc3ce98585a96da6c8e75497d087034b52f899797bb0972dfc0e79db99e81149e59e7fa765398c6ad35eba64f11f4ae9c3b3537434
+SHA512 (subversion-1.10.6.tar.bz2) = a4f80e1baf04ba62290fdff9d22ee12f65103edc72b42f5827d3bb0110bd2cae0f89ad95cddfd5862b2efbffa6639240f26d8412731534f6f40ab2f1915fc9ef

subversion-1.11.1-r1857391.patch

@@ -1,72 +0,0 @@
-# ./pullrev.sh 1857391
-http://svn.apache.org/viewvc?view=revision&revision=1857391
-
---- subversion-1.11.1/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
-+++ subversion-1.11.1/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
-@@ -46,7 +46,7 @@
- #include "svn_mergeinfo.h"
- #include "svn_types.h"
- 
--#include "svn_private_config.h" /* for SVN_APR_INT64_T_PYCFMT */
-+#include "svn_private_config.h"
- 
- #include "swig_python_external_runtime.swg"
- #include "swigutil_py.h"
-@@ -3394,10 +3394,9 @@
-   svn_swig_py_acquire_py_lock();
- 
-   if ((result = PyObject_CallFunction(receiver,
--                                      (char *)
--                                      (SVN_APR_INT64_T_PYCFMT "lsssO&"),
--                                      line_no, revision, author, date, line,
--                                      make_ob_pool, pool)) == NULL)
-+                                      (char *)"LlsssO&",
-+                                      (PY_LONG_LONG)line_no, revision, author,
-+                                      date, line, make_ob_pool, pool)) == NULL)
-     {
-       err = callback_exception_error();
-     }
---- subversion-1.11.1/build/ac-macros/swig.m4
-+++ subversion-1.11.1/build/ac-macros/swig.m4
-@@ -128,41 +128,6 @@
-       ac_cv_python_libs="`$PYTHON ${abs_srcdir}/build/get-py-info.py --libs`"
-     ])
-     SWIG_PY_LIBS="`SVN_REMOVE_STANDARD_LIB_DIRS($ac_cv_python_libs)`"
--
--    dnl Sun Forte adds an extra space before substituting APR_INT64_T_FMT
--    dnl gcc-2.95 adds an extra space after substituting APR_INT64_T_FMT
--    dnl thus the egrep patterns have a + in them.
--    SVN_PYCFMT_SAVE_CPPFLAGS="$CPPFLAGS"
--    CPPFLAGS="$CPPFLAGS $SVN_APR_INCLUDES"
--    AC_CACHE_CHECK([for apr_int64_t Python/C API format string],
--                   [svn_cv_pycfmt_apr_int64_t], [
--      if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then
--        AC_EGREP_CPP([MaTcHtHiS +\"lld\" +EnDeNd],
--                     [#include <apr.h>
--                      MaTcHtHiS APR_INT64_T_FMT EnDeNd],
--                     [svn_cv_pycfmt_apr_int64_t="L"])
--      fi
--      if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then
--        AC_EGREP_CPP([MaTcHtHiS +\"ld\" +EnDeNd],r
--                     [#include <apr.h>
--                      MaTcHtHiS APR_INT64_T_FMT EnDeNd],
--                     [svn_cv_pycfmt_apr_int64_t="l"])
--      fi
--      if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then
--        AC_EGREP_CPP([MaTcHtHiS +\"d\" +EnDeNd],
--                     [#include <apr.h>
--                      MaTcHtHiS APR_INT64_T_FMT EnDeNd],
--                     [svn_cv_pycfmt_apr_int64_t="i"])
--      fi
--    ])
--    CPPFLAGS="$SVN_PYCFMT_SAVE_CPPFLAGS"
--    if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then
--      AC_MSG_ERROR([failed to recognize APR_INT64_T_FMT on this platform])
--    fi
--    AC_DEFINE_UNQUOTED([SVN_APR_INT64_T_PYCFMT],
--                       ["$svn_cv_pycfmt_apr_int64_t"],
--                       [Define to the Python/C API format character suitable]
--                       [ for apr_int64_t])
-   fi
- 
-   if test "$PERL" != "none"; then

subversion.spec

@@ -36,7 +36,7 @@
 
 Summary: A Modern Concurrent Version Control System
 Name: subversion
-Version: 1.10.4
+Version: 1.10.6
 Release: 1%{?dist}
 License: ASL 2.0
 Group: Development/Tools
@@ -54,7 +54,6 @@ Patch1: subversion-1.10.0-rpath.patch
 Patch2: subversion-1.10.0-pie.patch
 Patch4: subversion-1.8.0-rubybind.patch
 Patch5: subversion-1.8.5-swigplWall.patch
-Patch6: subversion-1.11.1-r1857391.patch
 BuildRequires: autoconf, libtool, texinfo, which
 BuildRequires: swig >= 1.3.24, gettext
 %if %{with bdb}
@@ -221,7 +220,6 @@ This package includes supplementary tools for use with Subversion.
 %patch2 -p1 -b .pie
 %patch4 -p1 -b .rubybind
 %patch5 -p1 -b .swigplWall
-%patch6 -p1 -b .r1857391
 
 %build
 # Regenerate the buildsystem, so that:
@@ -544,6 +542,9 @@ make check-javahl
 %endif
 
 %changelog
+* Thu Jul 25 2019 Joe Orton <jorton@redhat.com> - 1.10.6-1
+- update to 1.10.6
+
 * Fri May 24 2019 Joe Orton <jorton@redhat.com> - 1.10.4-1
 - update to 1.10.4