Accepting request 265590 from GNOME:Apps

1

OBS-URL: https://build.opensuse.org/request/show/265590
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/geeqie?expand=0&rev=10

geeqie-1.1-fix-bashisms.patch

@@ -0,0 +1,21 @@
+diff -Ndur geeqie-1.1/plugins/rotate/geeqie-rotate geeqie-1.1-fix-bashisms/plugins/rotate/geeqie-rotate
+--- geeqie-1.1/plugins/rotate/geeqie-rotate	2012-08-12 23:13:40.000000000 +0300
++++ geeqie-1.1-fix-bashisms/plugins/rotate/geeqie-rotate	2014-11-17 05:25:16.014771785 +0200
+@@ -8,7 +8,7 @@
+ rotate()
+ {
+     ext=`echo "${1##*.}" |tr "[:upper:]" "[:lower:]"`
+-    [ "x$ext" == "x" ] && return 1 #no extension
++    [ "x$ext" = "x" ] && return 1 #no extension
+ 
+     gq_metadata="$GQ_METADATA_DIR/$1.gq.xmp"
+     if [ -f "$gq_metadata" ]; then
+@@ -48,7 +48,7 @@
+ }
+ 
+ get_sidecars=
+-if [ "x$1" == "x-g" ] ; then
++if [ "x$1" = "x-g" ] ; then
+     get_sidecars=yes
+     shift
+ fi

geeqie.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Wed Dec 17 13:55:36 UTC 2014 - zaitor@opensuse.org
+
+- Rebase patch to match what upstream actually have commited.
+
+-------------------------------------------------------------------
+Tue Dec 16 18:07:00 UTC 2014 - Led <ledest@gmail.com>
+
+- Add geeqie-1.1-fix-bashisms.patch: Fix bashisms in geeqie-rotate
+  script.
+
 -------------------------------------------------------------------
 Fri Dec 28 11:53:06 UTC 2012 - dvaleev@suse.com
 

geeqie.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package geeqie
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -27,6 +27,8 @@ Url:            http://geeqie.sourceforge.net/
 Source:         http://downloads.sourceforge.net/project/geeqie/geeqie/geeqie-1.1/%{name}-%{version}.tar.gz
 # PATCH-FIX-UPSTREAM geeqie-bigendian.patch dvaleev@suse.com -- Fix build on big endian systems. Taken from upstream commit c6793b7
 Patch0:         geeqie-bigendian.patch
+# PATCH-FIX-UPSTREAM geeqie-1.1-fix-bashisms.patch ledest@gmail.com -- Fix bashisms, upstream commit 7a32d30
+Patch1:         geeqie-1.1-fix-bashisms.patch
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
 BuildRequires:  gnome-doc-utils
@@ -53,6 +55,7 @@ operating systems.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure \