- Add subversion-1.10.0-fix-svn-version-gnome-keyring.patch to list

GNOME keyring support in svn --version when using libsecret

OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm:svn/subversion?expand=0&rev=274

subversion-1.10.0-fix-svn-version-gnome-keyring.patch

@@ -0,0 +1,53 @@
+------------------------------------------------------------------------
+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.changes

@@ -1,5 +1,5 @@
 -------------------------------------------------------------------
-Thu Apr 12 09:08:24 UTC 2018 - tchvatal@suse.com
+Thu Apr 12 22:30:33 UTC 2018 - astieger@suse.com
 
 - Apache Subversion 1.10.0:
   * new conflict resolver
@@ -18,6 +18,8 @@ Thu Apr 12 09:08:24 UTC 2018 - tchvatal@suse.com
   * subversion-1.8.11-autocheck-time.patch, upstream
   * subversion-1.9.0-allow-httpd-2.4.6.patch, no longer required
 - Use %license (boo#1082318)
+- Add subversion-1.10.0-fix-svn-version-gnome-keyring.patch to list
+  GNOME keyring support in svn --version when using libsecret
 
 -------------------------------------------------------------------
 Tue Dec 19 06:59:02 UTC 2017 - fstrba@suse.com

subversion.spec

@@ -55,6 +55,7 @@ Patch30:        subversion-1.8.0-rpath.patch
 Patch37:        subversion-no-build-date.patch
 Patch39:        subversion-fix-parallel-build-support-for-perl-bindings.patch
 Patch40:        subversion-perl-underlinking.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
@@ -215,6 +216,7 @@ parameters and keywords for the svn command and other tools.
 %patch37 -p1
 %patch39
 %patch40 -p1
+%patch41 -p1
 
 %build
 # Re-boot strap, needed for patch37