Hello community,
here is the log from the commit of package qiv for openSUSE:Factory checked in at 2014-12-16 14:48:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qiv (Old)
and /work/SRC/openSUSE:Factory/.qiv.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qiv"
Changes:
--------
--- /work/SRC/openSUSE:Factory/qiv/qiv.changes 2013-02-25 20:42:22.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.qiv.new/qiv.changes 2014-12-16 14:47:25.000000000 +0100
@@ -1,0 +2,7 @@
+Wed Nov 19 03:00:00 UTC 2014 - Led
+
+- fix bashisms in qiv-command.example script
+- add patches:
+ * qiv-2.2.4-fix-bashisms.patch
+
+-------------------------------------------------------------------
New:
----
qiv-2.2.4-fix-bashisms.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qiv.spec ++++++
--- /var/tmp/diff_new_pack.wcfIhi/_old 2014-12-16 14:47:26.000000000 +0100
+++ /var/tmp/diff_new_pack.wcfIhi/_new 2014-12-16 14:47:26.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package qiv
#
-# 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
@@ -26,6 +26,7 @@
Source0: http://spiegl.de/qiv/download/qiv-%{version}.tgz
Patch0: magic-optimization.patch
Patch1: update-copying.patch
+Patch2: qiv-2.2.4-fix-bashisms.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: file-devel
BuildRequires: gtk2-devel
@@ -77,6 +78,7 @@
%setup -q
%patch0 -p1
%patch1 -p1
+%patch2 -p1
sed -i 's/-O2/$(RPM_OPT_FLAGS)/' Makefile
%build
++++++ qiv-2.2.4-fix-bashisms.patch ++++++
diff -Ndur qiv-2.2.4/qiv-command.example qiv-2.2.4-fix-bashisms/qiv-command.example
--- qiv-2.2.4/qiv-command.example 2011-05-13 16:11:24.000000000 +0300
+++ qiv-2.2.4-fix-bashisms/qiv-command.example 2014-11-19 04:58:22.072827991 +0200
@@ -38,7 +38,7 @@
case "$pressed_key" in
- 0)
+ [0-57])
# do something with the image ($2) ->
#
# example: copy
@@ -52,12 +52,9 @@
# exiftool "$filename"
# jhead "$filename"
- echo -ne "0 was pushed.\nStart your own programs by editing the\n\"$0\" file!";
- ;;
-
-
- 1|2|3|4|5)
- echo -ne "$pressed_key was pushed.\nStart your own programs by editing the\n\"$0\" file!";
+ echo "$pressed_key was pushed."
+ echo "Start your own programs by editing the"
+ echo -n "\"$0\" file!"
;;
6)
@@ -66,10 +63,6 @@
jhead -ce $filename
;;
- 7)
- echo -ne "$pressed_key was pushed.\nStart your own programs by editing the\n\"$0\" file!";
- ;;
-
8) # lossless rotation of JPG, without losing EXIF tags
echo 2>&1 "Rotating to the left."
jhead -cmd "jpegtran -perfect -rotate 270 -outfile &o &i" $filename >/dev/null
@@ -108,7 +101,7 @@
new_img_name=`echo "$new_img_name" | tr ' ' '_'`
new_img_name=${new_img_name%.[Jj][Pp][Gg]}-${img_timestamp}.jpg
- [[ -f $new_img_name ]] && exit 1
+ [ -f $new_img_name ] && exit 1
mv $filename $new_img_name
echo "NEWNAME=$new_img_name"
;;
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org