From bbaf014fd9984c18227f71295fef0f487405e9bb Mon Sep 17 00:00:00 2001
From: Parag Nemade <pnemade@redhat.com>
Date: Nov 13 2012 17:22:30 +0000
Subject: Patch from Rui Matos for exec python in shell shim scripts


---

diff --git a/caribou-0.4.4.2-fix-python-exec.patch b/caribou-0.4.4.2-fix-python-exec.patch
new file mode 100644
index 0000000..181b8f5
--- /dev/null
+++ b/caribou-0.4.4.2-fix-python-exec.patch
@@ -0,0 +1,44 @@
+This allows gnome-session to properly kill the caribou process when
+the gsettings key is turned off.
+---
+ bin/antler-keyboard.in     | 2 +-
+ bin/caribou-preferences.in | 2 +-
+ bin/caribou.in             | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/bin/antler-keyboard.in b/bin/antler-keyboard.in
+index b25956e..6c66ddc 100755
+--- a/bin/antler-keyboard.in
++++ b/bin/antler-keyboard.in
+@@ -37,6 +37,6 @@ else
+   export ANTLER_THEME_PATH="$(dirname $script_dir)/data"
+ fi
+ 
+-@PYTHON@ -c "
++exec @PYTHON@ -c "
+ from caribou.antler.main import AntlerKeyboardService
+ AntlerKeyboardService().run()"
+diff --git a/bin/caribou-preferences.in b/bin/caribou-preferences.in
+index 49650ff..8db0f89 100755
+--- a/bin/caribou-preferences.in
++++ b/bin/caribou-preferences.in
+@@ -36,7 +36,7 @@ else
+   export LD_LIBRARY_PATH="$(dirname $script_dir)/libcaribou/.lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
+ fi
+ 
+-@PYTHON@ -c "
++exec @PYTHON@ -c "
+ import signal
+ signal.signal(signal.SIGINT, signal.SIG_DFL)
+ 
+diff --git a/bin/caribou.in b/bin/caribou.in
+index f2cdc2f..e8a29c7 100755
+--- a/bin/caribou.in
++++ b/bin/caribou.in
+@@ -38,4 +38,4 @@ else
+   export GI_TYPELIB_PATH="$(dirname $script_dir)/libcaribou${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}"
+ fi
+ 
+-@PYTHON@ -c "from caribou.daemon.main import CaribouDaemon; CaribouDaemon().run()"
++exec @PYTHON@ -c "from caribou.daemon.main import CaribouDaemon; CaribouDaemon().run()"
+-- 1.8.0
diff --git a/caribou.spec b/caribou.spec
index 4f4c9f1..53acf89 100644
--- a/caribou.spec
+++ b/caribou.spec
@@ -1,6 +1,6 @@
 Name:           caribou
 Version:        0.4.4.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A simplified in-place on-screen keyboard
 
 Group:          User Interface/Desktops
@@ -8,6 +8,7 @@ License:        LGPLv2+
 URL:            http://live.gnome.org/Caribou
 Source0:        http://download.gnome.org/sources/caribou/0.4/caribou-%{version}.tar.xz
 Patch0:         caribou-0.4.4.2-multilib.patch
+Patch1:         caribou-0.4.4.2-fix-python-exec.patch
 
 BuildRequires:  python-devel
 BuildRequires:  gtk2-devel
@@ -148,6 +149,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 
 
 %changelog
+* Tue Nov 13 2012 Parag Nemade <pnemade AT redhat.com> - 0.4.4.2-4
+- Patch from Rui Matos for exec python in shell shim scripts
+
 * Tue Nov 13 2012 Parag Nemade <pnemade AT redhat.com> - 0.4.4.2-3
 - Fix multilib patch