From 496564ae76a3df64855b2822e0e73daf9c9356e8 Mon Sep 17 00:00:00 2001
From: Parag Nemade <pnemade@redhat.com>
Date: Feb 17 2015 09:44:06 +0000
Subject: Rebase patches


---

diff --git a/caribou-0.4.17-fix-python-exec.patch b/caribou-0.4.17-fix-python-exec.patch
new file mode 100644
index 0000000..1a4ba47
--- /dev/null
+++ b/caribou-0.4.17-fix-python-exec.patch
@@ -0,0 +1,21 @@
+diff -urN caribou-0.4.17/bin/antler-keyboard.in caribou-0.4.17.new/bin/antler-keyboard.in
+--- caribou-0.4.17/bin/antler-keyboard.in	2015-02-17 15:11:20.162387108 +0530
++++ caribou-0.4.17.new/bin/antler-keyboard.in	2015-02-17 15:00:36.886570787 +0530
+@@ -52,4 +52,4 @@
+   export ANTLER_THEME_PATH="$(dirname $script_dir)/data"
+ fi
+ 
+-exec @PYTHON@ -m caribou.antler.main "$@"
++@PYTHON@ -m caribou.antler.main "$@"
+diff -urN caribou-0.4.17/bin/caribou-preferences.in caribou-0.4.17.new/bin/caribou-preferences.in
+--- caribou-0.4.17/bin/caribou-preferences.in	2015-02-17 15:04:35.979502517 +0530
++++ caribou-0.4.17.new/bin/caribou-preferences.in	2015-02-17 15:00:36.899570783 +0530
+@@ -50,7 +50,7 @@
+   export LD_LIBRARY_PATH="$(dirname $script_dir)/libcaribou/.lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
+ fi
+ 
+-exec @PYTHON@ -c "
++@PYTHON@ -c "
+ import signal
+ signal.signal(signal.SIGINT, signal.SIG_DFL)
+ 
diff --git a/caribou-0.4.17-multilib.patch b/caribou-0.4.17-multilib.patch
new file mode 100644
index 0000000..abfa061
--- /dev/null
+++ b/caribou-0.4.17-multilib.patch
@@ -0,0 +1,69 @@
+diff -urN caribou-0.4.17/bin/antler-keyboard.in caribou-0.4.17.new/bin/antler-keyboard.in
+--- caribou-0.4.17/bin/antler-keyboard.in	2015-01-16 14:18:49.000000000 +0530
++++ caribou-0.4.17.new/bin/antler-keyboard.in	2015-02-17 14:58:25.892608190 +0530
+@@ -18,6 +18,20 @@
+ # along with this program; if not, write to the Free Software Foundation,
+ # Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ 
++ARCH=$(uname -m)
++
++case $ARCH in
++x86_64 | sparc64 | s390x | ppc64)
++LIB_DIR=/usr/lib64
++SECONDARY_LIB_DIR=/usr/lib
++;;
++* )
++LIB_DIR=/usr/lib
++SECONDARY_LIB_DIR=/usr/lib64
++;;
++esac
++
++
+ script_dir="$(dirname "$(readlink -f ${0})")"
+ 
+ prefix=@prefix@
+@@ -28,8 +42,8 @@
+ then
+   datadir="$(@PYTHON@ -c "from gi.repository import GLib; print ':'.join(GLib.get_system_data_dirs())")"
+   export PYTHONPATH="${prefix}/lib/python@PYTHON_VERSION@/site-packages:${prefix}/lib64/python@PYTHON_VERSION@/site-packages${PYTHONPATH:+:$PYTHONPATH}"
+-  export GI_TYPELIB_PATH="@libdir@/girepository-1.0${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}"
+-  export LD_LIBRARY_PATH="@libdir@${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
++  export GI_TYPELIB_PATH="$LIB_DIR/girepository-1.0${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}"
++  export LD_LIBRARY_PATH="$LIB_DIR${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
+   export XDG_DATA_DIRS="@datadir@${datadir:+:$datadir}"
+ else
+   export PYTHONPATH="$(dirname $script_dir)${PYTHONPATH:+:$PYTHONPATH}"
+diff -urN caribou-0.4.17/bin/caribou-preferences.in caribou-0.4.17.new/bin/caribou-preferences.in
+--- caribou-0.4.17/bin/caribou-preferences.in	2013-01-11 08:01:47.000000000 +0530
++++ caribou-0.4.17.new/bin/caribou-preferences.in	2015-02-17 14:59:14.750594240 +0530
+@@ -18,6 +18,19 @@
+ # along with this program; if not, write to the Free Software Foundation,
+ # Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ 
++ARCH=$(uname -m)
++
++case $ARCH in
++x86_64 | sparc64 | s390x | ppc64)
++LIB_DIR=/usr/lib64
++SECONDARY_LIB_DIR=/usr/lib
++;;
++* )
++LIB_DIR=/usr/lib
++SECONDARY_LIB_DIR=/usr/lib64
++;;
++esac
++
+ script_dir="$(dirname "$(readlink -f ${0})")"
+ 
+ prefix=@prefix@
+@@ -28,8 +41,8 @@
+ then
+   datadir="$(@PYTHON@ -c "from gi.repository import GLib; print ':'.join(GLib.get_system_data_dirs())")"
+   export PYTHONPATH="@prefix@/lib/python@PYTHON_VERSION@/site-packages${PYTHONPATH:+:$PYTHONPATH}"
+-  export GI_TYPELIB_PATH="@libdir@/girepository-1.0${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}"
+-  export LD_LIBRARY_PATH="@libdir@${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
++  export GI_TYPELIB_PATH="$LIB_DIR/girepository-1.0${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}"
++  export LD_LIBRARY_PATH="$LIB_DIR${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
+   export XDG_DATA_DIRS="@datadir@${datadir:+:$datadir}"
+ else
+   export PYTHONPATH="$(dirname $script_dir)${PYTHONPATH:+:$PYTHONPATH}"
diff --git a/caribou-0.4.8-fix-python-exec.patch b/caribou-0.4.8-fix-python-exec.patch
deleted file mode 100644
index 5edba21..0000000
--- a/caribou-0.4.8-fix-python-exec.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -urN caribou-0.4.8.orig/bin/antler-keyboard.in caribou-0.4.8/bin/antler-keyboard.in
---- caribou-0.4.8.orig/bin/antler-keyboard.in	2013-02-19 09:46:47.412985958 +0530
-+++ caribou-0.4.8/bin/antler-keyboard.in	2013-02-19 09:45:18.142988226 +0530
-@@ -52,6 +52,6 @@
-   export ANTLER_THEME_PATH="$(dirname $script_dir)/data"
- fi
- 
--@PYTHON@ -c "
-+exec @PYTHON@ -c "
- from caribou.antler.main import AntlerKeyboardService
- AntlerKeyboardService().run()"
-diff -urN caribou-0.4.8.orig/bin/caribou-preferences.in caribou-0.4.8/bin/caribou-preferences.in
---- caribou-0.4.8.orig/bin/caribou-preferences.in	2013-02-19 09:46:47.412985958 +0530
-+++ caribou-0.4.8/bin/caribou-preferences.in	2013-02-19 09:45:18.140988226 +0530
-@@ -50,7 +50,7 @@
-   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/caribou-0.4.8-multilib.patch b/caribou-0.4.8-multilib.patch
deleted file mode 100644
index f5b24f5..0000000
--- a/caribou-0.4.8-multilib.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff -urN caribou-0.4.8.orig/bin/antler-keyboard.in caribou-0.4.8/bin/antler-keyboard.in
---- caribou-0.4.8.orig/bin/antler-keyboard.in	2013-01-06 07:04:17.000000000 +0530
-+++ caribou-0.4.8/bin/antler-keyboard.in	2013-02-19 09:43:35.652990828 +0530
-@@ -18,6 +18,20 @@
- # along with this program; if not, write to the Free Software Foundation,
- # Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- 
-+ARCH=$(uname -m)
-+
-+case $ARCH in
-+x86_64 | sparc64 | s390x | ppc64)
-+LIB_DIR=/usr/lib64
-+SECONDARY_LIB_DIR=/usr/lib
-+;;
-+* )
-+LIB_DIR=/usr/lib
-+SECONDARY_LIB_DIR=/usr/lib64
-+;;
-+esac
-+
-+
- script_dir="$(dirname "$(readlink -f ${0})")"
- 
- prefix=@prefix@
-@@ -28,8 +42,8 @@
- then
-   datadir="$(@PYTHON@ -c "from gi.repository import GLib; print ':'.join(GLib.get_system_data_dirs())")"
-   export PYTHONPATH="${prefix}/lib/python@PYTHON_VERSION@/site-packages:${prefix}/lib64/python@PYTHON_VERSION@/site-packages${PYTHONPATH:+:$PYTHONPATH}"
--  export GI_TYPELIB_PATH="@libdir@/girepository-1.0${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}"
--  export LD_LIBRARY_PATH="@libdir@${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
-+  export GI_TYPELIB_PATH="$LIB_DIR/girepository-1.0${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}"
-+  export LD_LIBRARY_PATH="$LIB_DIR${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
-   export XDG_DATA_DIRS="@datadir@${datadir:+:$datadir}"
- else
-   export PYTHONPATH="$(dirname $script_dir)${PYTHONPATH:+:$PYTHONPATH}"
-diff -urN caribou-0.4.8.orig/bin/caribou-preferences.in caribou-0.4.8/bin/caribou-preferences.in
---- caribou-0.4.8.orig/bin/caribou-preferences.in	2013-01-06 07:04:17.000000000 +0530
-+++ caribou-0.4.8/bin/caribou-preferences.in	2013-02-19 09:43:37.233990788 +0530
-@@ -18,6 +18,19 @@
- # along with this program; if not, write to the Free Software Foundation,
- # Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- 
-+ARCH=$(uname -m)
-+
-+case $ARCH in
-+x86_64 | sparc64 | s390x | ppc64)
-+LIB_DIR=/usr/lib64
-+SECONDARY_LIB_DIR=/usr/lib
-+;;
-+* )
-+LIB_DIR=/usr/lib
-+SECONDARY_LIB_DIR=/usr/lib64
-+;;
-+esac
-+
- script_dir="$(dirname "$(readlink -f ${0})")"
- 
- prefix=@prefix@
-@@ -28,8 +41,8 @@
- then
-   datadir="$(@PYTHON@ -c "from gi.repository import GLib; print ':'.join(GLib.get_system_data_dirs())")"
-   export PYTHONPATH="@prefix@/lib/python@PYTHON_VERSION@/site-packages${PYTHONPATH:+:$PYTHONPATH}"
--  export GI_TYPELIB_PATH="@libdir@/girepository-1.0${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}"
--  export LD_LIBRARY_PATH="@libdir@${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
-+  export GI_TYPELIB_PATH="$LIB_DIR/girepository-1.0${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}"
-+  export LD_LIBRARY_PATH="$LIB_DIR${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
-   export XDG_DATA_DIRS="@datadir@${datadir:+:$datadir}"
- else
-   export PYTHONPATH="$(dirname $script_dir)${PYTHONPATH:+:$PYTHONPATH}"
diff --git a/caribou.spec b/caribou.spec
index 06880a8..760acbf 100644
--- a/caribou.spec
+++ b/caribou.spec
@@ -5,8 +5,8 @@ Summary:        A simplified in-place on-screen keyboard
 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.8-multilib.patch
-Patch1:         caribou-0.4.8-fix-python-exec.patch
+Patch0:         caribou-0.4.17-multilib.patch
+Patch1:         caribou-0.4.17-fix-python-exec.patch
 
 BuildRequires:  python2-devel
 BuildRequires:  gtk2-devel