Hello community,
here is the log from the commit of package subversion for openSUSE:Factory checked in at 2018-04-22 14:30:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/subversion (Old)
and /work/SRC/openSUSE:Factory/.subversion.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "subversion"
Sun Apr 22 14:30:16 2018 rev:154 rq:596761 version:1.10.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/subversion/subversion.changes 2017-12-22 12:17:08.343112318 +0100
+++ /work/SRC/openSUSE:Factory/.subversion.new/subversion.changes 2018-04-22 14:30:18.489229873 +0200
@@ -1,0 +2,24 @@
+Sun Apr 15 17:43:29 UTC 2018 - astieger@suse.com
+
+- Apache Subversion 1.10.0:
+ * new conflict resolver
+ * Many bug fixes and enhancements
+ * lz4 compression for the repositories
+ * https://subversion.apache.org/docs/release-notes/1.10.html
+- Packaging changes;
+ * Convert dependencies to pkgconfig counterparts
+ * Add dependency on liblz4 and utf8proc
+ * Use %license (boo#1082318)
+ * build with KDE5 KWallet support
+- Refresh patches:
+ * subversion-1.8.0-rpath.patch
+ * subversion-no-build-date.patch
+ * subversion-fix-parallel-build-support-for-perl-bindings.patch
+ * subversion-perl-underlinking.patch
+- dropped patches:
+ * subversion-1.8.11-autocheck-time.patch, upstream
+ * subversion-1.9.0-allow-httpd-2.4.6.patch, no longer required
+- Add subversion-1.10.0-fix-svn-version-gnome-keyring.patch to list
+ GNOME keyring support in svn --version when using libsecret
+
+-------------------------------------------------------------------
Old:
----
contrib-1485350.tar.bz2
subversion-1.8.11-autocheck-time.patch
subversion-1.9.0-allow-httpd-2.4.6.patch
subversion-1.9.7.tar.bz2
subversion-1.9.7.tar.bz2.asc
subversion.rpmlintrc
New:
----
contrib-1804739.tar.bz2
subversion-1.10.0-fix-svn-version-gnome-keyring.patch
subversion-1.10.0.tar.bz2
subversion-1.10.0.tar.bz2.asc
subversion-rpmlintrc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ subversion.spec ++++++
--- /var/tmp/diff_new_pack.aTHKLX/_old 2018-04-22 14:30:19.553191364 +0200
+++ /var/tmp/diff_new_pack.aTHKLX/_new 2018-04-22 14:30:19.557191220 +0200
@@ -1,8 +1,7 @@
#
# spec file for package subversion
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
-# Copyright (c) 2013 Andreas Stieger
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2009-2010 Pascal Bleser
#
# All modifications and additions to the file contributed by third parties
@@ -20,20 +19,14 @@
%define svngroup svn
%define svnuser svn
-%{!?_tmpfilesdir: %global _tmpfilesdir %{_libexecdir}/tmpfiles.d }
%define _fwdefdir %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services
-%define sqlite_minimum_version 3.7.12
+%define sqlite_minimum_version 3.8.2
+%bcond_without gnome
# SLE does not ship KDE
%if 0%{?is_opensuse} != 1
-%define with_kde 0
+%bcond_with kde
%else
- # Disable kwallet support on Tumbleweed, because otherwise there will be
- # a conflict between libopenssl-devel versions pulled in by libserf and libqt4
- %if 0%{?suse_version} >= 1330
- %define with_kde 0
- %else
- %define with_kde 1
- %endif
+%bcond_without kde
%endif
#Compat macro for new _fillupdir macro introduced in Nov 2017
%if ! %{defined _fillupdir}
@@ -42,7 +35,7 @@
%bcond_without python_ctypes
%bcond_with all_regression_tests
Name: subversion
-Version: 1.9.7
+Version: 1.10.0
Release: 0
Summary: Subversion version control system
License: Apache-2.0
@@ -51,7 +44,7 @@
Source0: https://www.apache.org/dist/subversion/%{name}-%{version}.tar.bz2
Source1: subversion.conf
Source2: subversion.README.SUSE
-Source4: contrib-1485350.tar.bz2
+Source4: contrib-1804739.tar.bz2
Source10: subversion.sysconfig.svnserve
Source12: subversion.sysconfig.svnserve.remoteaccess
Source14: svnserve.service
@@ -60,7 +53,7 @@
Source43: subversion.svndiff.sh
Source50: https://people.apache.org/keys/group/subversion.asc#/subversion.keyring
Source51: https://www.apache.org/dist/subversion/%{name}-%{version}.tar.bz2.asc
-Source92: %{name}.rpmlintrc
+Source92: %{name}-rpmlintrc
Patch11: subversion.libtool-verbose.patch
Patch20: subversion-swig-perl-install_vendor.patch
Patch23: subversion-swig-perl-Wall.patch
@@ -68,41 +61,40 @@
Patch37: subversion-no-build-date.patch
Patch39: subversion-fix-parallel-build-support-for-perl-bindings.patch
Patch40: subversion-perl-underlinking.patch
-Patch45: subversion-1.8.11-autocheck-time.patch
-Patch48: subversion-1.9.0-allow-httpd-2.4.6.patch
+Patch41: subversion-1.10.0-fix-svn-version-gnome-keyring.patch
BuildRequires: apache-rpm-macros
BuildRequires: apache2-devel >= 2.2.0
BuildRequires: apache2-prefork
-BuildRequires: bash-completion
-BuildRequires: cyrus-sasl-devel
BuildRequires: db-devel
-BuildRequires: dbus-1-devel
BuildRequires: doxygen
BuildRequires: file-devel
BuildRequires: gcc-c++
-BuildRequires: glib2-devel
BuildRequires: java-devel >= 1.6.0
BuildRequires: junit
-BuildRequires: krb5-devel
-BuildRequires: libgnome-keyring-devel
BuildRequires: libstdc++-devel
BuildRequires: libtool
BuildRequires: pkgconfig
-# Test dependency
-BuildRequires: python-pysqlite
-# Python 2.7 or later is required to run autogen.sh
+# Python 2 is required to run autogen.sh ; swig is also hardcoded to py2
BuildRequires: python2-devel >= 2.7
BuildRequires: python2-xml
BuildRequires: ruby-devel >= 1.8.2
-BuildRequires: sqlite3-devel >= %{sqlite_minimum_version}
BuildRequires: swig
BuildRequires: update-alternatives
-BuildRequires: zlib-devel
+BuildRequires: utf8proc-devel
BuildRequires: pkgconfig(apr-1) >= 1.3.0
BuildRequires: pkgconfig(apr-util-1) >= 1.3.0
+BuildRequires: pkgconfig(bash-completion)
+BuildRequires: pkgconfig(krb5)
+BuildRequires: pkgconfig(liblz4) >= 1.7
+BuildRequires: pkgconfig(libsasl2)
BuildRequires: pkgconfig(serf-1) >= 1.3.4
+BuildRequires: pkgconfig(sqlite3) >= %{sqlite_minimum_version}
BuildRequires: pkgconfig(systemd)
+BuildRequires: pkgconfig(zlib)
+# Package needs javah which was deprecated with this version of java
BuildConflicts: java-devel >= 10
+# in openSUSE Leap 42.3, lz4 was incorrectly packaged
+BuildConflicts: pkgconfig(liblz4) = 124
Requires: libsqlite3-0 >= %{sqlite_minimum_version}
Requires(post): %fillup_prereq
Requires(pre): pwdutils
@@ -123,10 +115,19 @@
%if %{with python_ctypes}
BuildRequires: ctypesgen
%endif
-%if %{with_kde}
-BuildRequires: kdelibs4-core
-BuildRequires: libkde4-devel
-BuildRequires: libqt4-devel
+%if %{with gnome}
+BuildRequires: pkgconfig(dbus-1)
+BuildRequires: pkgconfig(libsecret-1)
+%endif
+%if %{with kde}
+BuildRequires: cmake(KF5CoreAddons)
+BuildRequires: cmake(KF5I18n)
+BuildRequires: cmake(KF5Wallet)
+BuildRequires: cmake(Qt5Core)
+BuildRequires: cmake(Qt5DBus)
+BuildRequires: cmake(Qt5Gui)
+# for kf5-config
+BuildRequires: kdelibs4support
%else
# In a case we migrate from system that had the kwallet integration we need it
# gone from the package to allow update
@@ -143,7 +144,6 @@
%package devel
Summary: Development package for Subversion developers
-# this pulls in libapr1-devel and libexpat-devel
Group: Development/Libraries/C and C++
Requires: libapr-util1-devel
Requires: subversion = %{version}
@@ -207,7 +207,7 @@
The subversion-server package adds the Subversion server Apache module
to the Apache directories and configuration.
-%if %{with_kde}
+%if %{with kde}
%package -n libsvn_auth_kwallet-1-0
Summary: KWallet support for Subversion
Group: Development/Tools/Version Control
@@ -219,6 +219,7 @@
Provides KWallet integration for Subversion
%endif
+%if %{with gnome}
%package -n libsvn_auth_gnome_keyring-1-0
Summary: GNOME keyring sypport for Subversion
Group: Development/Tools/Version Control
@@ -227,12 +228,13 @@
%description -n libsvn_auth_gnome_keyring-1-0
Provides GNOME keyring support for Subversion
+%endif
%package bash-completion
Summary: Bash Completion for %{name}
Group: Development/Tools/Version Control
Requires: %{name} = %{version}
-Requires: bash-completion
+Requires: pkgconfig(bash-completion)
BuildArch: noarch
%description bash-completion
@@ -248,8 +250,7 @@
%patch37 -p1
%patch39
%patch40 -p1
-%patch45 -p1
-%patch48 -p1
+%patch41 -p1
%build
# Re-boot strap, needed for patch37
@@ -304,8 +305,10 @@
--with-jikes=no \
--with-sqlite="%{_prefix}" \
--enable-sqlite-compatibility-version=%{sqlite_minimum_version} \
+%if %{with gnome}
--with-gnome-keyring \
-%if %{with_kde}
+%endif
+%if %{with kde}
--with-kwallet \
%endif
--disable-mod-activation \
@@ -446,16 +449,20 @@
%postun -n subversion-perl -p /sbin/ldconfig
%post -n subversion-ruby -p /sbin/ldconfig
%postun -n subversion-ruby -p /sbin/ldconfig
+
+%if %{with gnome}
%post -n libsvn_auth_gnome_keyring-1-0 -p /sbin/ldconfig
%postun -n libsvn_auth_gnome_keyring-1-0 -p /sbin/ldconfig
+%endif
-%if %{with_kde}
+%if %{with kde}
%post -n libsvn_auth_kwallet-1-0 -p /sbin/ldconfig
%postun -n libsvn_auth_kwallet-1-0 -p /sbin/ldconfig
%endif
%files -f files.subversion
-%doc README.SUSE BUGS CHANGES LICENSE README.mod_authz_svn
+%license LICENSE
+%doc README.SUSE BUGS CHANGES README.mod_authz_svn
%dir %{_docdir}/%{name}/*
%{_docdir}/%{name}
%{_sbindir}/rcsvnserve
@@ -540,11 +547,13 @@
%{apache_libexecdir}/mod_authz_svn.*
%{apache_libexecdir}/mod_dontdothat.*
+%if %{with gnome}
%files -n libsvn_auth_gnome_keyring-1-0
%{_libdir}/libsvn_auth_gnome_keyring-1.so.0
%{_libdir}/libsvn_auth_gnome_keyring-1.so.0.*
+%endif
-%if %{with_kde}
+%if %{with kde}
%files -n libsvn_auth_kwallet-1-0
%{_libdir}/libsvn_auth_kwallet-1.so.0
%{_libdir}/libsvn_auth_kwallet-1.so.0.*
++++++ contrib-1485350.tar.bz2 -> contrib-1804739.tar.bz2 ++++++
++++ 2834 lines of diff (skipped)
++++++ subversion-1.10.0-fix-svn-version-gnome-keyring.patch ++++++
------------------------------------------------------------------------
r1829015 | astieger | 2018-04-13 00:18:29 +0200 (Fri, 13 Apr 2018) | 6 lines
Changed paths:
M /subversion/trunk/subversion/svn/help-cmd.c
M /subversion/trunk/tools/client-side/svn-mergeinfo-normalizer/help-cmd.c
Follow-up to r1829012, handle macro correctly
* subversion/svn/help-cmd.c (svn_cl__help): handle macro correctly
* tools/client-side/svn-mergeinfo-normalizer/help-cmd.c
(svn_min__help): same
------------------------------------------------------------------------
r1829012 | astieger | 2018-04-13 00:03:06 +0200 (Fri, 13 Apr 2018) | 8 lines
Changed paths:
M /subversion/trunk/subversion/svn/help-cmd.c
M /subversion/trunk/tools/client-side/svn-mergeinfo-normalizer/help-cmd.c
Follow-up to r1798004, fix informative output for Gnome Keyring with
libsecret
* subversion/svn/help-cmd.c (svn_cl__help): Print Gnome Keyring when
* using libsecret
* tools/client-side/svn-mergeinfo-normalizer/help-cmd.c
(svn_min__help): same
------------------------------------------------------------------------
Index: trunk/subversion/svn/help-cmd.c
===================================================================
--- trunk/subversion/svn/help-cmd.c (revision 1829011)
+++ trunk/subversion/svn/help-cmd.c (revision 1829015)
@@ -166,7 +166,7 @@
pool);
#endif
}
-#ifdef SVN_HAVE_GNOME_KEYRING
+#if (defined(SVN_HAVE_GNOME_KEYRING) || defined(SVN_HAVE_LIBSECRET))
svn_stringbuf_appendcstr(version_footer, "* Gnome Keyring\n");
#endif
#ifdef SVN_HAVE_GPG_AGENT
Index: trunk/tools/client-side/svn-mergeinfo-normalizer/help-cmd.c
===================================================================
--- trunk/tools/client-side/svn-mergeinfo-normalizer/help-cmd.c (revision 1829011)
+++ trunk/tools/client-side/svn-mergeinfo-normalizer/help-cmd.c (revision 1829015)
@@ -163,7 +163,7 @@
pool)),
pool);
#endif
-#ifdef SVN_HAVE_GNOME_KEYRING
+#if (defined(SVN_HAVE_GNOME_KEYRING) || defined(SVN_HAVE_LIBSECRET))
svn_stringbuf_appendcstr(version_footer, "* Gnome Keyring\n");
#endif
#ifdef SVN_HAVE_GPG_AGENT
++++++ subversion-1.9.7.tar.bz2 -> subversion-1.10.0.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/subversion/subversion-1.9.7.tar.bz2 /work/SRC/openSUSE:Factory/.subversion.new/subversion-1.10.0.tar.bz2 differ: char 11, line 1
++++++ subversion-1.8.0-rpath.patch ++++++
--- /var/tmp/diff_new_pack.aTHKLX/_old 2018-04-22 14:30:20.021174426 +0200
+++ /var/tmp/diff_new_pack.aTHKLX/_new 2018-04-22 14:30:20.029174136 +0200
@@ -12,13 +12,13 @@
build/generator/gen_base.py | 3 ++-
3 files changed, 11 insertions(+), 8 deletions(-)
-Index: subversion-1.9.0-beta1/Makefile.in
+Index: subversion-1.10.0/Makefile.in
===================================================================
---- subversion-1.9.0-beta1.orig/Makefile.in 2015-03-06 23:32:00.000000000 +0100
-+++ subversion-1.9.0-beta1/Makefile.in 2015-03-06 23:33:25.000000000 +0100
-@@ -255,10 +255,10 @@ COMPILE_CXXHL_CXX = $(LT_COMPILE_CXX) $(
- COMPILE_GMOCK_CXX = $(LT_COMPILE_CXX_NOWARN) $(GMOCK_INCLUDES) -o $@ -c
- COMPILE_CXXHL_GMOCK_CXX = $(LT_COMPILE_CXX) $(CXXHL_INCLUDES) $(GMOCK_INCLUDES) -o $@ -c
+--- subversion-1.10.0.orig/Makefile.in
++++ subversion-1.10.0/Makefile.in
+@@ -264,10 +264,10 @@ COMPILE_CXXHL_CXX = $(LT_COMPILE_CXX) $(
+ 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)
@@ -30,11 +30,11 @@
+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)
-@@ -837,7 +837,9 @@ $(SWIG_PL_DIR)/native/Makefile.PL: $(SWI
+ LINK_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(APACHE_LIBEXECDIR) -avoid-version -module $(APACHE_LDFLAGS) -shared
+@@ -864,7 +864,9 @@ $(SWIG_PL_DIR)/native/Makefile.PL: $(SWI
./config.status subversion/bindings/swig/perl/native/Makefile.PL
- $(SWIG_PL_DIR)/native/Makefile: $(SWIG_PL_DIR)/native/Makefile.PL
+ $(SWIG_PL_DIR)/native/Makefile: libsvn_swig_perl $(SWIG_PL_DIR)/native/Makefile.PL
- cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL PREFIX=$(prefix)
+ cd $(SWIG_PL_DIR)/native; \
+ $(PERL) Makefile.PL PREFIX=$(prefix) INSTALLDIRS=vendor; \
@@ -42,11 +42,11 @@
# There is a "readlink -f" command on some systems for the same purpose,
# but it's not as portable (e.g. Mac OS X doesn't have it). These should
-Index: subversion-1.9.0-beta1/build.conf
+Index: subversion-1.10.0/build.conf
===================================================================
---- subversion-1.9.0-beta1.orig/build.conf 2015-03-06 23:32:00.000000000 +0100
-+++ subversion-1.9.0-beta1/build.conf 2015-03-06 23:32:05.000000000 +0100
-@@ -561,7 +561,7 @@ lang = python
+--- subversion-1.10.0.orig/build.conf
++++ subversion-1.10.0/build.conf
+@@ -568,7 +568,7 @@ lang = python
path = subversion/bindings/swig/python/libsvn_swig_py
libs = libsvn_client libsvn_wc libsvn_ra libsvn_delta libsvn_subr
apriconv apr python swig
@@ -55,7 +55,7 @@
install = swig-py-lib
# need special build rule to include -DSWIGPYTHON
compile-cmd = $(COMPILE_SWIG_PY)
-@@ -586,7 +586,7 @@ type = swig_lib
+@@ -594,7 +594,7 @@ type = swig_lib
lang = ruby
path = subversion/bindings/swig/ruby/libsvn_swig_ruby
libs = libsvn_client libsvn_wc libsvn_delta libsvn_subr apriconv apr ruby swig
@@ -64,11 +64,11 @@
install = swig-rb-lib
# need special build rule to include
compile-cmd = $(COMPILE_SWIG_RB)
-Index: subversion-1.9.0-beta1/build/generator/gen_base.py
+Index: subversion-1.10.0/build/generator/gen_base.py
===================================================================
---- subversion-1.9.0-beta1.orig/build/generator/gen_base.py 2015-03-06 23:32:00.000000000 +0100
-+++ subversion-1.9.0-beta1/build/generator/gen_base.py 2015-03-06 23:32:05.000000000 +0100
-@@ -497,7 +497,7 @@ class TargetLinked(Target):
+--- subversion-1.10.0.orig/build/generator/gen_base.py
++++ subversion-1.10.0/build/generator/gen_base.py
+@@ -599,7 +599,7 @@ class TargetLinked(Target):
self.install = options.get('install')
self.compile_cmd = options.get('compile-cmd')
self.sources = options.get('sources', '*.c *.cpp')
@@ -77,7 +77,7 @@
self.external_lib = options.get('external-lib')
self.external_project = options.get('external-project')
-@@ -550,6 +550,7 @@ class TargetExe(TargetLinked):
+@@ -653,6 +653,7 @@ class TargetExe(TargetLinked):
extmap = self.gen_obj._extension_map
self.objext = extmap['exe', 'object']
self.filename = build_path_join(self.path, name + extmap['exe', 'target'])
++++++ subversion-fix-parallel-build-support-for-perl-bindings.patch ++++++
--- /var/tmp/diff_new_pack.aTHKLX/_old 2018-04-22 14:30:20.045173557 +0200
+++ /var/tmp/diff_new_pack.aTHKLX/_new 2018-04-22 14:30:20.049173412 +0200
@@ -1,6 +1,8 @@
---- Makefile.in 2011-07-16 13:50:53.000000000 +0200
-+++ Makefile.in.new 2012-03-11 12:13:57.000000000 +0100
-@@ -732,7 +732,7 @@
+Index: Makefile.in
+===================================================================
+--- Makefile.in.orig
++++ Makefile.in
+@@ -860,7 +860,7 @@ clean-swig-headers:
extraclean-swig-headers: clean-swig-headers
$(EXTRACLEAN_SWIG_HEADERS)
@@ -8,4 +10,4 @@
+$(SWIG_PL_DIR)/native/Makefile.PL: $(SWIG_SRC_DIR)/perl/native/Makefile.PL.in libsvn_swig_perl
./config.status subversion/bindings/swig/perl/native/Makefile.PL
- $(SWIG_PL_DIR)/native/Makefile: $(SWIG_PL_DIR)/native/Makefile.PL
+ $(SWIG_PL_DIR)/native/Makefile: libsvn_swig_perl $(SWIG_PL_DIR)/native/Makefile.PL
++++++ subversion-no-build-date.patch ++++++
--- /var/tmp/diff_new_pack.aTHKLX/_old 2018-04-22 14:30:20.061172978 +0200
+++ /var/tmp/diff_new_pack.aTHKLX/_new 2018-04-22 14:30:20.061172978 +0200
@@ -13,10 +13,10 @@
subversion/tests/cmdline/getopt_tests_data/svn--version_stdout | 1 -
5 files changed, 6 insertions(+), 12 deletions(-)
-Index: subversion-1.9.6/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
+Index: subversion-1.10.0/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
===================================================================
---- subversion-1.9.6.orig/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java 2015-06-10 06:00:23.000000000 +0200
-+++ subversion-1.9.6/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java 2017-07-07 13:35:05.534444939 +0200
+--- subversion-1.10.0.orig/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
++++ subversion-1.10.0/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
@@ -144,10 +144,10 @@ public class BasicTests extends SVNTests
{
vx = client.getVersionExtended(false);
@@ -30,11 +30,11 @@
throw new Exception("Build time empty");
result = vx.getBuildHost();
if (result == null || result.trim().length() == 0)
-Index: subversion-1.9.6/subversion/libsvn_subr/opt.c
+Index: subversion-1.10.0/subversion/libsvn_subr/opt.c
===================================================================
---- subversion-1.9.6.orig/subversion/libsvn_subr/opt.c 2014-10-29 13:54:38.000000000 +0100
-+++ subversion-1.9.6/subversion/libsvn_subr/opt.c 2017-07-07 13:35:05.562445219 +0200
-@@ -1109,12 +1109,8 @@ svn_opt__print_version_info(const char *
+--- subversion-1.10.0.orig/subversion/libsvn_subr/opt.c
++++ subversion-1.10.0/subversion/libsvn_subr/opt.c
+@@ -1118,12 +1118,8 @@ svn_opt__print_version_info(const char *
if (quiet)
return svn_cmdline_printf(pool, "%s\n", SVN_VER_NUMBER);
@@ -49,11 +49,11 @@
SVN_ERR(svn_cmdline_printf(pool, "%s\n", svn_version_ext_copyright(info)));
if (footer)
-Index: subversion-1.9.6/subversion/libsvn_subr/version.c
+Index: subversion-1.10.0/subversion/libsvn_subr/version.c
===================================================================
---- subversion-1.9.6.orig/subversion/libsvn_subr/version.c 2017-06-30 14:33:23.000000000 +0200
-+++ subversion-1.9.6/subversion/libsvn_subr/version.c 2017-07-07 13:35:05.562445219 +0200
-@@ -132,8 +132,8 @@ svn_version_extended(svn_boolean_t verbo
+--- subversion-1.10.0.orig/subversion/libsvn_subr/version.c
++++ subversion-1.10.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) 2017 The Apache Software Foundation.\n"
-Index: subversion-1.9.6/subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stdout
+ (pool, _("Copyright (C) 2018 The Apache Software Foundation.\n"
+Index: subversion-1.10.0/subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stdout
===================================================================
---- subversion-1.9.6.orig/subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stdout 2015-05-14 06:00:23.000000000 +0200
-+++ subversion-1.9.6/subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stdout 2017-07-07 13:35:05.562445219 +0200
+--- subversion-1.10.0.orig/subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stdout
++++ subversion-1.10.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.9.6/subversion/tests/cmdline/getopt_tests_data/svn--version_stdout
+Index: subversion-1.10.0/subversion/tests/cmdline/getopt_tests_data/svn--version_stdout
===================================================================
---- subversion-1.9.6.orig/subversion/tests/cmdline/getopt_tests_data/svn--version_stdout 2015-05-14 06:00:23.000000000 +0200
-+++ subversion-1.9.6/subversion/tests/cmdline/getopt_tests_data/svn--version_stdout 2017-07-07 13:35:05.562445219 +0200
+--- subversion-1.10.0.orig/subversion/tests/cmdline/getopt_tests_data/svn--version_stdout
++++ subversion-1.10.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-perl-underlinking.patch ++++++
--- /var/tmp/diff_new_pack.aTHKLX/_old 2018-04-22 14:30:20.077172399 +0200
+++ /var/tmp/diff_new_pack.aTHKLX/_new 2018-04-22 14:30:20.077172399 +0200
@@ -1,19 +1,21 @@
-diff -urN subversion-1.8.10.old/Makefile.in subversion-1.8.10/Makefile.in
---- subversion-1.8.10.old/Makefile.in 2014-08-19 14:05:55.226069730 +0200
-+++ subversion-1.8.10/Makefile.in 2014-08-19 14:55:21.696069376 +0200
-@@ -791,7 +791,7 @@
- if test "`$(READLINK_PL) $(SWIG_PL_DIR)`" != "`$(READLINK_PL) $(SWIG_PL_SRC_DIR)`"; then \
- ln -sf $(SWIG_PL_SRC_DIR)/native/*.c $(SWIG_PL_DIR)/native; \
+Index: subversion-1.10.0-alpha2/Makefile.in
+===================================================================
+--- subversion-1.10.0-alpha2.orig/Makefile.in 2017-02-24 15:57:25.605638431 +0100
++++ subversion-1.10.0-alpha2/Makefile.in 2017-02-24 15:57:25.617638527 +0100
+@@ -865,7 +865,7 @@ swig-pl: $(swig-pl_DEPS)
+ fi; \
+ done; \
fi
- cd $(SWIG_PL_DIR)/native; $(MAKE) OPTIMIZE="" OTHERLDFLAGS="$(SWIG_LDFLAGS)"
+ cd $(SWIG_PL_DIR)/native; $(MAKE)
check-swig-pl: swig-pl swig-pl-lib
cd $(SWIG_PL_DIR)/native; $(MAKE) test
-diff -urN subversion-1.8.10.old/subversion/bindings/swig/perl/native/Makefile.PL.in subversion-1.8.10/subversion/bindings/swig/perl/native/Makefile.PL.in
---- subversion-1.8.10.old/subversion/bindings/swig/perl/native/Makefile.PL.in 2014-08-19 14:05:55.198069730 +0200
-+++ subversion-1.8.10/subversion/bindings/swig/perl/native/Makefile.PL.in 2014-08-19 14:41:23.190069476 +0200
-@@ -86,7 +86,7 @@
+Index: subversion-1.10.0-alpha2/subversion/bindings/swig/perl/native/Makefile.PL.in
+===================================================================
+--- subversion-1.10.0-alpha2.orig/subversion/bindings/swig/perl/native/Makefile.PL.in 2017-02-24 15:57:25.561638078 +0100
++++ subversion-1.10.0-alpha2/subversion/bindings/swig/perl/native/Makefile.PL.in 2017-02-24 15:57:25.617638527 +0100
+@@ -85,7 +85,7 @@ my %config = (
" -I$svnlib_builddir",
" -I$swig_srcdir -g"),
OBJECT => q/$(O_FILES)/,
++++++ subversion-rpmlintrc ++++++
# libsvn_subr calls exit as part of the default malfunction handler.
# That's OK. Library users are expected to override the default handler.
addFilter("subversion.*shared-lib-calls-exit.*libsvn_subr-1.so.*")
++++++ subversion.README.SUSE ++++++
--- /var/tmp/diff_new_pack.aTHKLX/_old 2018-04-22 14:30:20.153169648 +0200
+++ /var/tmp/diff_new_pack.aTHKLX/_new 2018-04-22 14:30:20.153169648 +0200
@@ -6,7 +6,7 @@
Topics:
-0. upgrading to Apache Subversion 1.9
+0. upgrading to Apache Subversion 1.10
1. mini-howto
2. allowing anonymous read access
3. serving several repositories with SVNParentPath
@@ -17,24 +17,23 @@
================================================================================
-0. upgrading to Apache Subversion 1.9
+0. upgrading to Apache Subversion 1.10
- concerns when upgrading from earlier versions
* Upgrading the Working Copy
- 1.9 uses the same working copy format introduced in 1.8. When upgrading
+ 1.10 uses the same working copy format as 1.8 and 1.9. When upgrading
a working copy from a client earlier than 1.8, a one-time execution of
"svn upgrade" is required. After that, clients earlier than 1.8 will
- be unable to use the working copy. Working copy must have been
- created using 1.6 or 1.7. For details, please see:
- https://subversion.apache.org/docs/release-notes/1.9.html#wc-upgrade
+ be unable to use the working copy. For details, please see:
+ https://subversion.apache.org/docs/release-notes/1.10.html#wc-upgrade
* Upgrading the Repository
- 1.9 can read and write repositories created by earlier versions.
- "svnadmin upgrade" may be used to upgrade to FSFS format 7 of 1.9,
- after which the repository will be no longer be usable for 1.8 servers.
+ 1.10 can read and write repositories created by earlier versions.
+ "svnadmin upgrade" may be used to upgrade to FSFS format 8 of 1.10,
+ after which the repository will be no longer be usable for 1.9 servers.
An optional dump/load cycle may be used to apply FSFS improvements
- to past revisions.
- https://subversion.apache.org/docs/release-notes/1.9.html#compatibility
- https://subversion.apache.org/docs/release-notes/1.9.html#fsfs-improvements
+ to past revisions, for 1.10 this is the LZ4 compression feature.
+ https://subversion.apache.org/docs/release-notes/1.10.html#compatibility
+ https://subversion.apache.org/docs/release-notes/1.10.html#lz4
================================================================================
++++++ subversion.keyring ++++++
++++ 105075 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/subversion/subversion.keyring
++++ and /work/SRC/openSUSE:Factory/.subversion.new/subversion.keyring