From ea6b11b40d7a56e9664058772c5deaef226bc941f7702fa0c2927be38c82da59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Tue, 16 Dec 2014 22:49:48 +0000 Subject: [PATCH 1/3] Accepting request 265466 from home:Ledest:bashisms fix bashisms in geeqie-rotate script OBS-URL: https://build.opensuse.org/request/show/265466 OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/geeqie?expand=0&rev=8 --- geeqie-1.1-fix-bashisms.patch | 21 +++++++++++++++++++++ geeqie.changes | 7 +++++++ geeqie.spec | 5 ++++- 3 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 geeqie-1.1-fix-bashisms.patch diff --git a/geeqie-1.1-fix-bashisms.patch b/geeqie-1.1-fix-bashisms.patch new file mode 100644 index 0000000..cd65da1 --- /dev/null +++ b/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 ++ [ -n "$ext" ] || 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 diff --git a/geeqie.changes b/geeqie.changes index 8442a46..0d26480 100644 --- a/geeqie.changes +++ b/geeqie.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Dec 16 18:07:00 UTC 2014 - Led + +- fix bashisms in geeqie-rotate script +- add patches: + * geeqie-1.1-fix-bashisms.patch + ------------------------------------------------------------------- Fri Dec 28 11:53:06 UTC 2012 - dvaleev@suse.com diff --git a/geeqie.spec b/geeqie.spec index 96df549..8ece29e 100644 --- a/geeqie.spec +++ b/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 +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 \ From c1316ec390d1e55e924c10c694ecbfab4ea6652385830d1634412ec288e82eb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Tue, 16 Dec 2014 22:52:48 +0000 Subject: [PATCH 2/3] Tweak, add upstream ref OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/geeqie?expand=0&rev=9 --- geeqie.changes | 5 ++--- geeqie.spec | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/geeqie.changes b/geeqie.changes index 0d26480..78b5db7 100644 --- a/geeqie.changes +++ b/geeqie.changes @@ -1,9 +1,8 @@ ------------------------------------------------------------------- Tue Dec 16 18:07:00 UTC 2014 - Led -- fix bashisms in geeqie-rotate script -- add patches: - * geeqie-1.1-fix-bashisms.patch +- Add geeqie-1.1-fix-bashisms.patch: Fix bashisms in geeqie-rotate + script. ------------------------------------------------------------------- Fri Dec 28 11:53:06 UTC 2012 - dvaleev@suse.com diff --git a/geeqie.spec b/geeqie.spec index 8ece29e..56ff02a 100644 --- a/geeqie.spec +++ b/geeqie.spec @@ -27,7 +27,7 @@ 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 +# 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++ From 70d7897a169a91deafe8c96bb550c5584fcf1a60dc7e68f6991e135af331d2a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Wed, 17 Dec 2014 17:16:24 +0000 Subject: [PATCH 3/3] Accepting request 265570 from home:Zaitor:branches:GNOME:Apps Rebase patch to match what upstream actually have commited. OBS-URL: https://build.opensuse.org/request/show/265570 OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/geeqie?expand=0&rev=10 --- geeqie-1.1-fix-bashisms.patch | 2 +- geeqie.changes | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/geeqie-1.1-fix-bashisms.patch b/geeqie-1.1-fix-bashisms.patch index cd65da1..ef037e2 100644 --- a/geeqie-1.1-fix-bashisms.patch +++ b/geeqie-1.1-fix-bashisms.patch @@ -6,7 +6,7 @@ diff -Ndur geeqie-1.1/plugins/rotate/geeqie-rotate geeqie-1.1-fix-bashisms/plugi { ext=`echo "${1##*.}" |tr "[:upper:]" "[:lower:]"` - [ "x$ext" == "x" ] && return 1 #no extension -+ [ -n "$ext" ] || return 1 #no extension ++ [ "x$ext" = "x" ] && return 1 #no extension gq_metadata="$GQ_METADATA_DIR/$1.gq.xmp" if [ -f "$gq_metadata" ]; then diff --git a/geeqie.changes b/geeqie.changes index 78b5db7..8e7d73d 100644 --- a/geeqie.changes +++ b/geeqie.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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