diff --git a/caribou-0.4.5-fix-python-exec.patch b/caribou-0.4.5-fix-python-exec.patch deleted file mode 100644 index 4bcdb99..0000000 --- a/caribou-0.4.5-fix-python-exec.patch +++ /dev/null @@ -1,32 +0,0 @@ -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:14:14.220606924 +0530 -@@ -37,6 +37,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.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:14:14.220606924 +0530 -@@ -38,4 +38,4 @@ - 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()" -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:14:14.221606925 +0530 -@@ -36,7 +36,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.5-multilib.patch b/caribou-0.4.5-multilib.patch deleted file mode 100644 index 9eb85a1..0000000 --- a/caribou-0.4.5-multilib.patch +++ /dev/null @@ -1,100 +0,0 @@ -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 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 - -+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@ -@@ -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 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.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 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 - -+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@ -@@ -32,7 +45,7 @@ - if [ $script_dir = "@bindir@" ] - then - 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 GI_TYPELIB_PATH="$LIB_DIR/girepository-1.0${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}" - 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-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 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 - -+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@ -@@ -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${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.6-fix-python-exec.patch b/caribou-0.4.6-fix-python-exec.patch new file mode 100644 index 0000000..cd9ab2e --- /dev/null +++ b/caribou-0.4.6-fix-python-exec.patch @@ -0,0 +1,32 @@ +diff -urN caribou-0.4.6.orig/bin/antler-keyboard.in caribou-0.4.6/bin/antler-keyboard.in +--- caribou-0.4.6.orig/bin/antler-keyboard.in 2012-12-13 21:57:09.000000000 +0530 ++++ caribou-0.4.6/bin/antler-keyboard.in 2012-12-18 19:05:28.917235134 +0530 +@@ -37,6 +37,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.6.orig/bin/caribou.in caribou-0.4.6/bin/caribou.in +--- caribou-0.4.6.orig/bin/caribou.in 2012-12-13 21:57:09.000000000 +0530 ++++ caribou-0.4.6/bin/caribou.in 2012-12-18 19:05:05.076216771 +0530 +@@ -38,4 +38,4 @@ + 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()" +diff -urN caribou-0.4.6.orig/bin/caribou-preferences.in caribou-0.4.6/bin/caribou-preferences.in +--- caribou-0.4.6.orig/bin/caribou-preferences.in 2012-12-13 21:57:09.000000000 +0530 ++++ caribou-0.4.6/bin/caribou-preferences.in 2012-12-18 19:05:18.396226978 +0530 +@@ -36,7 +36,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.6-multilib.patch b/caribou-0.4.6-multilib.patch new file mode 100644 index 0000000..d81e260 --- /dev/null +++ b/caribou-0.4.6-multilib.patch @@ -0,0 +1,100 @@ +diff -urN caribou-0.4.6.orig/bin/antler-keyboard.in caribou-0.4.6/bin/antler-keyboard.in +--- caribou-0.4.6.orig/bin/antler-keyboard.in 2012-12-13 21:57:09.000000000 +0530 ++++ caribou-0.4.6/bin/antler-keyboard.in 2012-12-18 19:51:29.214158415 +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@ +@@ -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 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.6.orig/bin/caribou.in caribou-0.4.6/bin/caribou.in +--- caribou-0.4.6.orig/bin/caribou.in 2012-12-13 21:57:09.000000000 +0530 ++++ caribou-0.4.6/bin/caribou.in 2012-12-18 19:51:29.213158414 +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 + ++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@ +@@ -32,7 +45,7 @@ + if [ $script_dir = "@bindir@" ] + then + 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 GI_TYPELIB_PATH="$LIB_DIR/girepository-1.0${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}" + 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.6.orig/bin/caribou-preferences.in caribou-0.4.6/bin/caribou-preferences.in +--- caribou-0.4.6.orig/bin/caribou-preferences.in 2012-12-13 21:57:09.000000000 +0530 ++++ caribou-0.4.6/bin/caribou-preferences.in 2012-12-18 19:51:29.214158415 +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@ +@@ -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${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 80cec7f..4b2e709 100644 --- a/caribou.spec +++ b/caribou.spec @@ -1,14 +1,12 @@ Name: caribou -Version: 0.4.5 +Version: 0.4.6 Release: 1%{?dist} Summary: A simplified in-place on-screen keyboard - -Group: User Interface/Desktops 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.5-multilib.patch -Patch1: caribou-0.4.5-fix-python-exec.patch +Patch0: caribou-0.4.6-multilib.patch +Patch1: caribou-0.4.6-fix-python-exec.patch BuildRequires: python2-devel BuildRequires: gtk2-devel @@ -41,8 +39,7 @@ a simplified in-place on-screen keyboard. %package devel Summary: Development files for %{name} -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} # Obsolete retired 'gok' to make sure it gets removed with distro upgrade Obsoletes: gok-devel < 2.30.1-6 @@ -52,7 +49,6 @@ developing applications that use %{name}. %package -n python-caribou Summary: Keyboard UI for %{name} -Group: System Environment/Libraries Requires: pygobject3 Requires: pyatspi Requires: %{name} = %{version}-%{release} @@ -63,31 +59,29 @@ BuildArch: noarch This package contains caribou python GUI %package gtk2-module -Summary: Gtk2 im module for %{name} -Group: System Environment/Libraries -Requires: %{name} = %{version}-%{release} +Summary: Gtk2 module for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} Obsoletes: caribou < 0.4.1-3 %description gtk2-module -This package contains caribou im module for gtk2 +This package contains caribou module for gtk2 applications. %package gtk3-module -Summary: Gtk3 im module for %{name} -Group: System Environment/Libraries -Requires: %{name} = %{version}-%{release} +Summary: Gtk3 module for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} Obsoletes: caribou < 0.4.1-3 %description gtk3-module -This package contains caribou im module for gtk3 +This package contains caribou module for gtk3 applications. %package antler Summary: Keyboard implementation for %{name} -Group: User Interface/Desktops Requires: python-%{name} = %{version}-%{release} Obsoletes: caribou < 0.4.1-3 %description antler -This package contains caribou keyboard implementation +This package contains caribou keyboard implementation for +non-gnome-shell sessions. %prep %setup -q @@ -162,7 +156,10 @@ fi %changelog -*Tue Dec 18 2012 Parag Nemade - 0.4.5-1 +* Thu Dec 20 2012 Parag Nemade - 0.4.6-1 +- Update to 0.4.6 + +* Tue Dec 18 2012 Parag Nemade - 0.4.5-1 - Update to 0.4.5 - Resolves:rh#744852 - Pressing | in on-screen keyboard produces < - Resolves:rh#880379 - Another service acquired %%s, quitting..