diff --git a/caribou-0.4.5-multilib.patch b/caribou-0.4.5-multilib.patch index 67a1068..9eb85a1 100644 --- a/caribou-0.4.5-multilib.patch +++ b/caribou-0.4.5-multilib.patch @@ -1,6 +1,6 @@ diff -urN caribou-0.4.5.orig/bin/antler-keyboard.in caribou-0.4.5/bin/antler-keyboard.in --- caribou-0.4.5.orig/bin/antler-keyboard.in 2012-11-20 23:11:25.000000000 +0530 -+++ caribou-0.4.5/bin/antler-keyboard.in 2012-12-18 19:30:30.382276403 +0530 ++++ caribou-0.4.5/bin/antler-keyboard.in 2012-12-18 20:19:17.253252756 +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 @@ -21,22 +21,20 @@ diff -urN caribou-0.4.5.orig/bin/antler-keyboard.in caribou-0.4.5/bin/antler-key script_dir="$(dirname "$(readlink -f ${0})")" prefix=@prefix@ -@@ -27,9 +40,9 @@ +@@ -27,8 +40,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 XDG_DATA_DIRS="@datadir@${datadir:+:$datadir}" + 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}" - export GI_TYPELIB_PATH="$(dirname $script_dir)/libcaribou${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}" diff -urN caribou-0.4.5.orig/bin/caribou.in caribou-0.4.5/bin/caribou.in --- caribou-0.4.5.orig/bin/caribou.in 2012-11-20 23:11:25.000000000 +0530 -+++ caribou-0.4.5/bin/caribou.in 2012-12-18 19:30:30.382276403 +0530 ++++ caribou-0.4.5/bin/caribou.in 2012-12-18 20:18:57.280240349 +0530 @@ -24,6 +24,19 @@ # along with this program; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA @@ -68,7 +66,7 @@ diff -urN caribou-0.4.5.orig/bin/caribou.in caribou-0.4.5/bin/caribou.in export GI_TYPELIB_PATH="$(dirname $script_dir)/libcaribou${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}" diff -urN caribou-0.4.5.orig/bin/caribou-preferences.in caribou-0.4.5/bin/caribou-preferences.in --- caribou-0.4.5.orig/bin/caribou-preferences.in 2012-11-20 23:11:25.000000000 +0530 -+++ caribou-0.4.5/bin/caribou-preferences.in 2012-12-18 19:30:30.384276407 +0530 ++++ caribou-0.4.5/bin/caribou-preferences.in 2012-12-18 20:18:57.281240350 +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 diff --git a/caribou.spec b/caribou.spec index d7feb0c..80cec7f 100644 --- a/caribou.spec +++ b/caribou.spec @@ -281,5 +281,5 @@ fi * Fri May 28 2010 Matthias Clasen - 0.1.2-1 - Update to 0.1.2 -* Thu Jan 21 2009 Ben Konrath - 0.0.2-1 +* Wed Jan 21 2009 Ben Konrath - 0.0.2-1 - Initial release.