diff --git a/.gitignore b/.gitignore index 0b0f141..a2fe61b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ /subversion-*.tar.bz2 +/subversion-1\.[0-9]*\.[0-9]*/ +/results_subversion/ diff --git a/sources b/sources index f4b0b26..281b2f0 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (subversion-1.10.3.tar.bz2) = e753c76be2c7a7d1e47ef70a417f33ad48a5076ddbe02062b478b0baf8ce063f101aab3a86895e33f6277f273917b87d8c07b002e3e4f9fe3a750a2f8142ef6d +SHA512 (subversion-1.10.4.tar.bz2) = c44a4a4a9533cd4f4cb6ddbc3ce98585a96da6c8e75497d087034b52f899797bb0972dfc0e79db99e81149e59e7fa765398c6ad35eba64f11f4ae9c3b3537434 diff --git a/subversion-1.11.1-r1857391.patch b/subversion-1.11.1-r1857391.patch new file mode 100644 index 0000000..eb70c45 --- /dev/null +++ b/subversion-1.11.1-r1857391.patch @@ -0,0 +1,72 @@ +# ./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 +- 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 +- 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 +- 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 diff --git a/subversion.spec b/subversion.spec index af9766d..eee3c88 100644 --- a/subversion.spec +++ b/subversion.spec @@ -37,7 +37,7 @@ Summary: A Modern Concurrent Version Control System Name: subversion Version: 1.10.3 -Release: 1%{?dist} +Release: 2%{?dist} License: ASL 2.0 Group: Development/Tools URL: https://subversion.apache.org/ @@ -54,6 +54,7 @@ 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} @@ -220,6 +221,7 @@ 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: @@ -542,6 +544,9 @@ make check-javahl %endif %changelog +* Fri May 24 2019 Joe Orton - 1.10.3-2 +- fix build with APR 1.7.0 (upstream r1857391) + * Thu Oct 11 2018 Joe Orton - 1.10.3-1 - update to 1.10.3