[qiv] 2.2.3-2 exit instead of abort on child error (#680602)

[Andreas Bierfert]

commit f631b2a08748e786b8ac99c21ea02a62da89734b
Author: Andreas Bierfert <andreas.bierfert at lowlatency.de>
Date:   Thu Mar 3 13:57:10 2011 +0100

    2.2.3-2
    exit instead of abort on child error (#680602)

 qiv-exit-on-child-error.patch |   12 ++++++++++++
 qiv.spec                      |   10 ++++++++--
 2 files changed, 20 insertions(+), 2 deletions(-)
---
diff --git a/qiv-exit-on-child-error.patch b/qiv-exit-on-child-error.patch
new file mode 100644
index 0000000..254c448
--- /dev/null
+++ b/qiv-exit-on-child-error.patch
@@ -0,0 +1,12 @@
+diff -up qiv-2.2.3/utils.c.orig qiv-2.2.3/utils.c
+--- qiv-2.2.3/utils.c.orig	2011-03-03 13:55:58.000000000 +0100
++++ qiv-2.2.3/utils.c	2011-03-03 13:56:23.000000000 +0100
+@@ -278,7 +278,7 @@ void run_command(qiv_image *q, char *n, 
+ 
+     execlp("qiv-command", "qiv-command", nr, filename, NULL);
+     perror("Error calling qiv-command");
+-    abort();
++    exit(EXIT_FAILURE);
+   }
+   else if (pid > 0) {
+     /* parent */
diff --git a/qiv.spec b/qiv.spec
index 530f6b9..bf2f020 100644
--- a/qiv.spec
+++ b/qiv.spec
@@ -1,6 +1,6 @@
 Name:           qiv
 Version:        2.2.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        Quick Image Viewer
 
@@ -9,6 +9,8 @@ License:        GPLv2
 URL:            http://spiegl.de/qiv/
 Source0:        http://spiegl.de/qiv/download/qiv-2.2.3.tgz
 Patch0:         %{name}-optflags.patch
+# call exit instead of abort on child error
+Patch1:         %{name}-exit-on-child-error.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel, imlib2-devel
@@ -21,7 +23,7 @@ qiv is a very small and pretty fast gdk2/Imlib2 image viewer.
 %prep
 %setup -q
 %patch0 -p0
-
+%patch1 -p1 -b .childexit
 
 %build
 make %{?_smp_mflags}
@@ -46,6 +48,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Mar 02 2011 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 2.2.3-2
+- exit instead of abort on child error (#680602)
+
 * Mon Mar 29 2010 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 2.2.3-1
 - version upgrade (#560965)