[geeqie] Merge image-overlay.c fix for handling of filenames with % in them.

[Michael Schwendt]

commit 54ededd6a47426c01e2eb79294fc260e166fe338
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Sun Jan 26 19:56:04 2014 +0100

    Merge image-overlay.c fix for handling of filenames with % in them.

 geeqie-1.1-percent-char-in-filenames.patch |   21 +++++++++++++++++++++
 geeqie.spec                                |    8 +++++++-
 2 files changed, 28 insertions(+), 1 deletions(-)
---
diff --git a/geeqie-1.1-percent-char-in-filenames.patch b/geeqie-1.1-percent-char-in-filenames.patch
new file mode 100644
index 0000000..cf2324d
--- /dev/null
+++ b/geeqie-1.1-percent-char-in-filenames.patch
@@ -0,0 +1,21 @@
+diff -Nurb --strip-trailing-cr geeqie-1.1-orig/src/image-overlay.c geeqie-1.1/src/image-overlay.c
+--- geeqie-1.1-orig/src/image-overlay.c	2012-08-12 22:13:41.000000000 +0200
++++ geeqie-1.1/src/image-overlay.c	2014-01-26 19:37:32.288510852 +0100
+@@ -261,7 +261,7 @@
+ 
+ 	new = g_string_new(str);
+ 
+-	prev = 0;
++	prev = -1;
+ 
+ 	while (TRUE)
+ 		{
+@@ -272,7 +272,7 @@
+ 		gchar *extrapos = NULL;
+ 		gchar *p;
+ 
+-		start = strchr(new->str, delim);
++		start = strchr(new->str + (prev + 1), delim);
+ 		if (!start)
+ 			break;
+ 		end = strchr(start+1, delim);
diff --git a/geeqie.spec b/geeqie.spec
index ecd4da1..49d9c76 100644
--- a/geeqie.spec
+++ b/geeqie.spec
@@ -8,7 +8,7 @@
 Summary: Image browser and viewer
 Name: geeqie
 Version: 1.1
-Release: 16%{?dist}
+Release: 17%{?dist}
 License: GPLv2+
 Group: User Interface/X
 Source: http://downloads.sf.net/sourceforge/geeqie/%{name}-%{upstreamversion}.tar.gz
@@ -35,6 +35,8 @@ Patch6: geeqie-1.1-filedata-avoid-history-abort.patch
 Patch7: geeqie-1.1-large-files.patch
 # LCMS2 patch from Geeqie-devel mailing-list
 Patch8: geeqie-1.1-lcms2.patch
+# from master
+Patch9: geeqie-1.1-percent-char-in-filenames.patch
 
 BuildRequires: gtk2-devel
 %if %{with lcms1}
@@ -94,6 +96,7 @@ done
 %patch8 -p1
 autoreconf -f -i
 %endif
+%patch9 -p1 -b .percent-char-in-filenames
 
 %build
 %configure --enable-lirc --disable-tiff \
@@ -143,6 +146,9 @@ update-desktop-database &> /dev/null || :
 
 
 %changelog
+* Sun Jan 26 2014 Michael Schwendt <mschwendt at fedoraproject.org> - 1.1-17
+- Merge image-overlay.c fix for handling of filenames with % in them.
+
 * Mon Dec  9 2013 Michael Schwendt <mschwendt at fedoraproject.org> - 1.1-16
 - Add LCMS2 patch from Geeqie-devel list, fix HAVE_LCMS and build with
   lcms2-devel instead of lcms-devel.