diff --git a/.gitignore b/.gitignore index 45e87fb..1ed048c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/gnucash-3.5.tar.bz2 +/gnucash-3.6.tar.bz2 diff --git a/0f6465ca6ddfb882db15c54685ba218e5c59c430.diff b/0f6465ca6ddfb882db15c54685ba218e5c59c430.diff deleted file mode 100644 index fd98977..0000000 --- a/0f6465ca6ddfb882db15c54685ba218e5c59c430.diff +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/libgnucash/engine/gnc-uri-utils.c b/libgnucash/engine/gnc-uri-utils.c -index 56390041c2..0158820e31 100644 ---- a/libgnucash/engine/gnc-uri-utils.c -+++ b/libgnucash/engine/gnc-uri-utils.c -@@ -323,7 +323,22 @@ gchar *gnc_uri_create_uri (const gchar *scheme, - else - uri_scheme = g_strdup (scheme); - -- if (g_str_has_prefix (abs_path, "/")) -+ /* Arrive here with... -+ * -+ * /my/path/to/file with space.txt -+ * becomes file:///my/path/to/file with space.txt -+ * -+ * c:\my\path\to\file with space.txt -+ * becomes file:///c:\my\path\to\file with space.txt -+ * -+ * \\myserver\share\path\to\file with space.txt -+ * becomes file://\\myserver\share\path\to\file with space.txt -+ * -+ * probably they should all be forward slashs and spaces escaped -+ * also with UNC it could be file://myserver/share/path/to/file with space.txt -+ */ -+ -+ if (g_str_has_prefix (abs_path, "/") || g_str_has_prefix (abs_path, "\\")) - uri = g_strdup_printf ( "%s://%s", uri_scheme, abs_path ); - else // for windows add an extra "/" - uri = g_strdup_printf ( "%s:///%s", uri_scheme, abs_path ); diff --git a/20e2b6b5de513d4fa9362d51524f8cddb523f607.patch b/20e2b6b5de513d4fa9362d51524f8cddb523f607.patch deleted file mode 100644 index 5558046..0000000 --- a/20e2b6b5de513d4fa9362d51524f8cddb523f607.patch +++ /dev/null @@ -1,30 +0,0 @@ -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 60b7e04..7c69639 100644 --- a/gnucash.spec +++ b/gnucash.spec @@ -1,14 +1,10 @@ Name: gnucash Summary: Finance management application -Version: 3.5 +Version: 3.6 URL: http://gnucash.org/ -Release: 3%{?dist} +Release: 1%{?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 @@ -92,6 +88,9 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_datadir}/metainfo/gnucas %config(noreplace) %{_sysconfdir}/gnucash/* %changelog +* Fri Jul 5 2019 Bill Nottingham - 3.6-1 +- update to 3.6 + * Fri May 3 2019 Bill Nottingham - 3.5-3 - add (another) upstream patch for https://bugzilla.redhat.com/show_bug.cgi?id=1698706 diff --git a/sources b/sources index babdc00..8d70975 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnucash-3.5.tar.bz2) = 76230d2fe1ba4cc605d0d58976ed3214b10a2549fc7eaa1e327bbf85c861baa082523c70ed088a59bb56deb6af9a7808752fc719eda0df3e9209cec05c9c8d13 +SHA512 (gnucash-3.6.tar.bz2) = 3d99235a6171e7189dbb15fed11e7f3acb4f49ef8dc6124b26807e74ce4326ac5ae6e23e693a34947604ecb0253ecbcd80f669803a629eb7d236fd3444dbfe82