Hello community,
here is the log from the commit of package subversion for openSUSE:Factory
checked in at 2020-07-14 07:42:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/subversion (Old)
and /work/SRC/openSUSE:Factory/.subversion.new.3060 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "subversion"
Tue Jul 14 07:42:56 2020 rev:174 rq:819162 version:1.14.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/subversion/subversion.changes 2020-05-07
15:06:19.327814300 +0200
+++ /work/SRC/openSUSE:Factory/.subversion.new.3060/subversion.changes
2020-07-14 07:43:05.682647708 +0200
@@ -1,0 +2,14 @@
+Thu Jun 11 07:40:28 UTC 2020 - Tomáš Chvátal <tchva...@suse.com>
+
+- Update to 1.14.0:
+ * Support for Python 3.x
+ * Support for Python 2.7 is being phased out
+ * New Build-Time Dependency: py3c
+ * Many enhancements and bug fixes
+- Drop patches:
+ * subversion-1.12.0-swig-4.patch
+ * ruby27-warnings.patch
+ * ruby-includes.patch
+- Refresh patch subversion-no-build-date.patch
+
+-------------------------------------------------------------------
Old:
----
ruby-includes.patch
ruby27-warnings.patch
subversion-1.12.0-swig-4.patch
subversion-1.13.0.tar.bz2
subversion-1.13.0.tar.bz2.asc
New:
----
subversion-1.14.0.tar.bz2
subversion-1.14.0.tar.bz2.asc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ subversion.spec ++++++
--- /var/tmp/diff_new_pack.FRyynx/_old 2020-07-14 07:43:08.146655663 +0200
+++ /var/tmp/diff_new_pack.FRyynx/_new 2020-07-14 07:43:08.150655676 +0200
@@ -34,7 +34,7 @@
%bcond_with python_ctypes
%bcond_with all_regression_tests
Name: subversion
-Version: 1.13.0
+Version: 1.14.0
Release: 0
Summary: Subversion version control system
License: Apache-2.0
@@ -60,11 +60,7 @@
Patch37: subversion-no-build-date.patch
Patch39: subversion-fix-parallel-build-support-for-perl-bindings.patch
Patch40: subversion-perl-underlinking.patch
-# PATCH-FIX-UPSTREAM subversion-1.12.0-swig-4.patch -- Support Swig 4
-Patch41: subversion-1.12.0-swig-4.patch
Patch42: gcc10-do-not-optimize-get_externals_to_pin.patch
-Patch43: ruby27-warnings.patch
-Patch44: ruby-includes.patch
Patch45: disable-fs-fs-pack-test.patch
BuildRequires: apache-rpm-macros
BuildRequires: apache2-devel >= 2.2.0
@@ -78,9 +74,10 @@
BuildRequires: libstdc++-devel
BuildRequires: libtool
BuildRequires: pkgconfig
-# Python 2 is required to run autogen.sh ; swig is also hardcoded to py2
-BuildRequires: python2-devel >= 2.7
-BuildRequires: python2-xml
+BuildRequires: py3c-devel
+BuildRequires: python3-devel >= 2.7
+BuildRequires: python3-py3c
+BuildRequires: python3-xml
BuildRequires: ruby-devel >= 1.8.2
BuildRequires: swig
BuildRequires: update-alternatives
@@ -243,14 +240,12 @@
%patch37 -p1
%patch39
%patch40 -p1
-%if 0%{?suse_version} > 1500
-%patch41 -p1
-%endif
%patch42 -p1
-%patch43 -p1
-%patch44 -p1
%patch45 -p1
+# do not use 'env python'
+sed -i -e 's#/usr/bin/env python#/usr/bin/python3#'
subversion/tests/cmdline/*.py
+
%build
# Re-boot strap, needed for patch37
PATH=%{_prefix}/bin:$PATH ./autogen.sh --release
@@ -314,17 +309,17 @@
--with-libmagic \
--disable-static \
--enable-broken-httpd-auth
-make %{?_smp_mflags}
-make doc-api %{?_smp_mflags}
+%make_build
+%make_build doc-api
# Bindings
-make extraclean-bindings %{?_smp_mflags}
-make %{?_smp_mflags} swig-py swig-rb swig-pl
+%make_build extraclean-bindings
+%make_build swig-py swig-rb swig-pl
%if %{with python_ctypes}
-make %{?_smp_mflags} ctypes-python
+%make_build ctypes-python
%endif
# Java is not thread safe
-make -j1 JAVAC_FLAGS=" -encoding iso8859-1" javahl doc-javahl
+%make_build -j1 JAVAC_FLAGS=" -encoding iso8859-1" javahl doc-javahl
%install
%make_install
@@ -407,19 +402,19 @@
%check
export LANG=C LC_ALL=C
-make %{?_smp_mflags} check CLEANUP=true || (cat fails.log; exit 1)
-make %{?_smp_mflags} check-javahl || (cat fails.log; exit 1)
-make %{?_smp_mflags} check-swig-pl || (cat fails.log; exit 1)
+%make_build check CLEANUP=true || (cat fails.log; exit 1)
+%make_build check-javahl || (cat fails.log; exit 1)
+%make_build check-swig-pl || (cat fails.log; exit 1)
%if 0%{?suse_version} <= 1500
# swig bindings check failing from swig 4.0.0 and later
-make %{?_smp_mflags} check-swig-py || (cat fails.log; exit 1)
+%make_build check-swig-py || (cat fails.log; exit 1)
%endif
-make %{?_smp_mflags} check-swig-rb || (cat fails.log; exit 1)
+%make_build check-swig-rb || (cat fails.log; exit 1)
%if %{with all_regression_tests}
-make %{?_smp_mflags} svnserveautocheck CLEANUP=true FS_TYPE=fsfs || (cat
fails.log; exit 1)
-make %{?_smp_mflags} svnserveautocheck CLEANUP=true FS_TYPE=bdb || (cat
fails.log; exit 1)
-make %{?_smp_mflags} davautocheck CLEANUP=true FS_TYPE=fsfs || (cat fails.log;
exit 1)
-make %{?_smp_mflags} davautocheck CLEANUP=true FS_TYPE=bdb || (cat fails.log;
exit 1)
+%make_build svnserveautocheck CLEANUP=true FS_TYPE=fsfs || (cat fails.log;
exit 1)
+%make_build svnserveautocheck CLEANUP=true FS_TYPE=bdb || (cat fails.log; exit
1)
+%make_build davautocheck CLEANUP=true FS_TYPE=fsfs || (cat fails.log; exit 1)
+%make_build davautocheck CLEANUP=true FS_TYPE=bdb || (cat fails.log; exit 1)
%endif
%pre
++++++ subversion-1.13.0.tar.bz2 -> subversion-1.14.0.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/subversion/subversion-1.13.0.tar.bz2
/work/SRC/openSUSE:Factory/.subversion.new.3060/subversion-1.14.0.tar.bz2
differ: char 11, line 1
++++++ subversion-no-build-date.patch ++++++
--- /var/tmp/diff_new_pack.FRyynx/_old 2020-07-14 07:43:08.218655895 +0200
+++ /var/tmp/diff_new_pack.FRyynx/_new 2020-07-14 07:43:08.218655895 +0200
@@ -13,11 +13,11 @@
subversion/tests/cmdline/getopt_tests_data/svn--version_stdout
| 1 -
5 files changed, 6 insertions(+), 12 deletions(-)
-Index:
subversion-1.11.1/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
+Index:
subversion-1.14.0/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
===================================================================
----
subversion-1.11.1.orig/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
2018-04-16 15:51:21.000000000 +0200
-+++
subversion-1.11.1/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
2019-01-18 15:03:10.407588129 +0100
-@@ -144,10 +144,10 @@ public class BasicTests extends SVNTests
+---
subversion-1.14.0.orig/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
++++
subversion-1.14.0/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
+@@ -146,10 +146,10 @@ public class BasicTests extends SVNTests
{
vx = client.getVersionExtended(false);
String result = vx.getBuildDate();
@@ -30,11 +30,11 @@
throw new Exception("Build time empty");
result = vx.getBuildHost();
if (result == null || result.trim().length() == 0)
-Index: subversion-1.11.1/subversion/libsvn_subr/opt.c
+Index: subversion-1.14.0/subversion/libsvn_subr/opt.c
===================================================================
---- subversion-1.11.1.orig/subversion/libsvn_subr/opt.c 2018-03-15
12:54:29.000000000 +0100
-+++ subversion-1.11.1/subversion/libsvn_subr/opt.c 2019-01-18
15:03:10.407588129 +0100
-@@ -1085,12 +1085,8 @@ svn_opt__print_version_info(const char *
+--- subversion-1.14.0.orig/subversion/libsvn_subr/opt.c
++++ subversion-1.14.0/subversion/libsvn_subr/opt.c
+@@ -1147,12 +1147,8 @@ svn_opt__print_version_info(const char *
if (quiet)
return svn_cmdline_printf(pool, "%s\n", SVN_VER_NUMBER);
@@ -49,10 +49,10 @@
SVN_ERR(svn_cmdline_printf(pool, "%s\n", svn_version_ext_copyright(info)));
if (footer)
-Index: subversion-1.11.1/subversion/libsvn_subr/version.c
+Index: subversion-1.14.0/subversion/libsvn_subr/version.c
===================================================================
---- subversion-1.11.1.orig/subversion/libsvn_subr/version.c 2019-01-04
12:38:50.000000000 +0100
-+++ subversion-1.11.1/subversion/libsvn_subr/version.c 2019-01-18
15:03:10.407588129 +0100
+--- subversion-1.14.0.orig/subversion/libsvn_subr/version.c
++++ subversion-1.14.0/subversion/libsvn_subr/version.c
@@ -139,8 +139,8 @@ svn_version_extended(svn_boolean_t verbo
{
svn_version_extended_t *info = apr_pcalloc(pool, sizeof(*info));
@@ -63,21 +63,21 @@
+ info->build_time = "";
info->build_host = SVN_BUILD_HOST;
info->copyright = apr_pstrdup
- (pool, _("Copyright (C) 2019 The Apache Software Foundation.\n"
-Index:
subversion-1.11.1/subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stdout
+ (pool, _("Copyright (C) 2020 The Apache Software Foundation.\n"
+Index:
subversion-1.14.0/subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stdout
===================================================================
----
subversion-1.11.1.orig/subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stdout
2015-05-11 14:35:49.000000000 +0200
-+++
subversion-1.11.1/subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stdout
2019-01-18 15:03:10.407588129 +0100
+---
subversion-1.14.0.orig/subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stdout
++++
subversion-1.14.0/subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stdout
@@ -1,5 +1,4 @@
svn, version 1.9.0-dev (under development)
- compiled Feb 26 2014, 15:15:42 on x86_64-unknown-openbsd5.5
Copyright (C) 2012 The Apache Software Foundation.
This software consists of contributions made by many people;
-Index:
subversion-1.11.1/subversion/tests/cmdline/getopt_tests_data/svn--version_stdout
+Index:
subversion-1.14.0/subversion/tests/cmdline/getopt_tests_data/svn--version_stdout
===================================================================
----
subversion-1.11.1.orig/subversion/tests/cmdline/getopt_tests_data/svn--version_stdout
2015-05-11 14:35:49.000000000 +0200
-+++
subversion-1.11.1/subversion/tests/cmdline/getopt_tests_data/svn--version_stdout
2019-01-18 15:03:10.407588129 +0100
+---
subversion-1.14.0.orig/subversion/tests/cmdline/getopt_tests_data/svn--version_stdout
++++
subversion-1.14.0/subversion/tests/cmdline/getopt_tests_data/svn--version_stdout
@@ -1,5 +1,4 @@
svn, version 1.9.0-dev (under development)
- compiled Feb 26 2014, 15:15:42 on x86_64-unknown-openbsd5.5
++++++ subversion.keyring ++++++
++++ 63997 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/subversion/subversion.keyring
++++ and /work/SRC/openSUSE:Factory/.subversion.new.3060/subversion.keyring
