From 61083c2fdb16ba56678599ec62b977baf26dd16c Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: May 03 2019 15:10:40 +0000 Subject: add another upstream patch --- diff --git a/20e2b6b5de513d4fa9362d51524f8cddb523f607.patch b/20e2b6b5de513d4fa9362d51524f8cddb523f607.patch new file mode 100644 index 0000000..5558046 --- /dev/null +++ b/20e2b6b5de513d4fa9362d51524f8cddb523f607.patch @@ -0,0 +1,30 @@ +commit 20e2b6b5de513d4fa9362d51524f8cddb523f607 +Author: Robert Fewell <14uBobIT@gmail.com> +Date: Fri Apr 19 15:51:29 2019 +0100 + + Bug 797175 - Opening a file from a gvfs mount point fails + + When testing for a MS Windows path which has a ":", a gvfs path with the + format '/run/user/1000/gvfs/smb-share:server=192.168.1.11,share=public/ + test-xml-file.gnucash' is recognised as a Windows path. To avoid this + expand the test to ":/" and also ":\" + +diff --git a/libgnucash/engine/gnc-uri-utils.c b/libgnucash/engine/gnc-uri-utils.c +old mode 100644 +new mode 100755 +index 0158820e3..40ec6fef1 +--- a/libgnucash/engine/gnc-uri-utils.c ++++ b/libgnucash/engine/gnc-uri-utils.c +@@ -177,8 +177,10 @@ void gnc_uri_get_components (const gchar *uri, + if ( gnc_uri_is_file_scheme ( *scheme ) ) + { + /* a true file uri on windows can start file:///N:/ +- so we come here with /N:/ */ +- if (g_str_has_prefix (splituri[1], "/") && g_strstr_len (splituri[1], -1, ":") != NULL) ++ so we come here with /N:/, it could also be /N:\ ++ */ ++ if (g_str_has_prefix (splituri[1], "/") && ++ ((g_strstr_len (splituri[1], -1, ":/") != NULL) || (g_strstr_len (splituri[1], -1, ":\\") != NULL))) + { + gchar *ptr = splituri[1]; + *path = gnc_resolve_file_path ( ptr + 1 ); diff --git a/gnucash.spec b/gnucash.spec index c90087f..60b7e04 100644 --- a/gnucash.spec +++ b/gnucash.spec @@ -2,11 +2,13 @@ Name: gnucash Summary: Finance management application Version: 3.5 URL: http://gnucash.org/ -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Source: http://downloads.sourceforge.net/sourceforge/gnucash/gnucash-%{version}.tar.bz2 # upstream patch for https://bugzilla.redhat.com/show_bug.cgi?id=1698706 Patch1: 0f6465ca6ddfb882db15c54685ba218e5c59c430.diff +# upstream patch for https://bugzilla.redhat.com/show_bug.cgi?id=1698706 +Patch2: 20e2b6b5de513d4fa9362d51524f8cddb523f607.patch # https://bugzilla.redhat.com/show_bug.cgi?id=1563466 ExcludeArch: ppc64 s390x @@ -90,6 +92,9 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_datadir}/metainfo/gnucas %config(noreplace) %{_sysconfdir}/gnucash/* %changelog +* Fri May 3 2019 Bill Nottingham - 3.5-3 +- add (another) upstream patch for https://bugzilla.redhat.com/show_bug.cgi?id=1698706 + * Mon Apr 15 2019 Bill Nottingham - 3.5-2 - add upstream patch for https://bugzilla.redhat.com/show_bug.cgi?id=1698706