[caribou] Update to 0.4.5
pnemade
pnemade at fedoraproject.org
Tue Dec 18 14:28:07 UTC 2012
commit 4267d9bca14253f025c44c9f536558de56ddab84
Author: Parag Nemade <pnemade at redhat.com>
Date: Tue Dec 18 19:59:55 2012 +0530
Update to 0.4.5
- Resolves:rh#744852 - Pressing | in on-screen keyboard produces <
- Resolves:rh#880379 - Another service acquired %s, quitting..
- Resolves:rh#880382
.gitignore | 1 +
caribou-0.4.4.2-fix-python-exec.patch | 44 --------------------
caribou-0.4.5-fix-python-exec.patch | 32 ++++++++++++++
...-multilib.patch => caribou-0.4.5-multilib.patch | 26 ++++++------
caribou.spec | 30 ++++++++++---
sources | 2 +-
6 files changed, 70 insertions(+), 65 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 93bb60b..01bddef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ caribou-0.1.5.tar.bz2
/caribou-0.4.1.tar.xz
/caribou-0.4.3.tar.xz
/caribou-0.4.4.2.tar.xz
+/caribou-0.4.5.tar.xz
diff --git a/caribou-0.4.5-fix-python-exec.patch b/caribou-0.4.5-fix-python-exec.patch
new file mode 100644
index 0000000..4bcdb99
--- /dev/null
+++ b/caribou-0.4.5-fix-python-exec.patch
@@ -0,0 +1,32 @@
+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
+
+- at 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
+
+- at 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
+
+- at PYTHON@ -c "
++exec @PYTHON@ -c "
+ import signal
+ signal.signal(signal.SIGINT, signal.SIG_DFL)
+
diff --git a/caribou-0.4.4.2-multilib.patch b/caribou-0.4.5-multilib.patch
similarity index 76%
rename from caribou-0.4.4.2-multilib.patch
rename to caribou-0.4.5-multilib.patch
index 1406ade..67a1068 100644
--- a/caribou-0.4.4.2-multilib.patch
+++ b/caribou-0.4.5-multilib.patch
@@ -1,6 +1,6 @@
-diff -urN caribou-0.4.4.2-old/bin/antler-keyboard.in caribou-0.4.4.2/bin/antler-keyboard.in
---- caribou-0.4.4.2-old/bin/antler-keyboard.in 2012-11-12 23:49:21.000000000 +0530
-+++ caribou-0.4.4.2/bin/antler-keyboard.in 2012-11-13 17:19:41.963705977 +0530
+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
@@ -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
@@ -18,7 +18,7 @@ diff -urN caribou-0.4.4.2-old/bin/antler-keyboard.in caribou-0.4.4.2/bin/antler-
+;;
+esac
+
- script_dir="$(dirname "$(readlink -f ${BASH_SOURCE[0]})")"
+ script_dir="$(dirname "$(readlink -f ${0})")"
prefix=@prefix@
@@ -27,9 +40,9 @@
@@ -30,13 +30,13 @@ diff -urN caribou-0.4.4.2-old/bin/antler-keyboard.in caribou-0.4.4.2/bin/antler-
- 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="$LIB_DIR${datadir:+:$datadir}"
+ 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.4.2-old/bin/caribou.in caribou-0.4.4.2/bin/caribou.in
---- caribou-0.4.4.2-old/bin/caribou.in 2012-11-12 23:49:21.000000000 +0530
-+++ caribou-0.4.4.2/bin/caribou.in 2012-11-13 17:20:35.308743165 +0530
+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
@@ -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
@@ -54,7 +54,7 @@ diff -urN caribou-0.4.4.2-old/bin/caribou.in caribou-0.4.4.2/bin/caribou.in
+;;
+esac
+
- script_dir="$(dirname "$(readlink -f ${BASH_SOURCE[0]})")"
+ script_dir="$(dirname "$(readlink -f ${0})")"
prefix=@prefix@
@@ -32,7 +45,7 @@
@@ -66,9 +66,9 @@ diff -urN caribou-0.4.4.2-old/bin/caribou.in caribou-0.4.4.2/bin/caribou.in
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.4.2-old/bin/caribou-preferences.in caribou-0.4.4.2/bin/caribou-preferences.in
---- caribou-0.4.4.2-old/bin/caribou-preferences.in 2012-11-12 23:49:21.000000000 +0530
-+++ caribou-0.4.4.2/bin/caribou-preferences.in 2012-11-13 17:21:52.503794659 +0530
+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
@@ -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
@@ -86,7 +86,7 @@ diff -urN caribou-0.4.4.2-old/bin/caribou-preferences.in caribou-0.4.4.2/bin/car
+;;
+esac
+
- script_dir="$(dirname "$(readlink -f ${BASH_SOURCE[0]})")"
+ script_dir="$(dirname "$(readlink -f ${0})")"
prefix=@prefix@
@@ -27,8 +40,8 @@
diff --git a/caribou.spec b/caribou.spec
index 6e84bfb..d7feb0c 100644
--- a/caribou.spec
+++ b/caribou.spec
@@ -1,14 +1,14 @@
Name: caribou
-Version: 0.4.4.2
-Release: 6%{?dist}
+Version: 0.4.5
+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.4.2-multilib.patch
-Patch1: caribou-0.4.4.2-fix-python-exec.patch
+Patch0: caribou-0.4.5-multilib.patch
+Patch1: caribou-0.4.5-fix-python-exec.patch
BuildRequires: python2-devel
BuildRequires: gtk2-devel
@@ -22,11 +22,13 @@ BuildRequires: clutter-devel
BuildRequires: vala-devel
BuildRequires: libXtst-devel
BuildRequires: libxklavier-devel
-BuildRequires: libgee06-devel
+BuildRequires: libgee-devel
BuildRequires: gobject-introspection-devel
Requires: python-%{name} = %{version}-%{release}
Requires: gobject-introspection
+Requires: caribou-gtk2-module
+Requires: caribou-gtk3-module
#Following is needed as package moved from noarch to arch
Obsoletes: caribou < 0.4.1-3
@@ -112,11 +114,19 @@ desktop-file-validate $RPM_BUILD_ROOT%{_libdir}/gnome-settings-daemon-3.0/gtk-mo
%postun
/sbin/ldconfig
if [ $1 -eq 0 ] ; then
- glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
+ /usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
fi
%posttrans
-glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
+/usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
+
+%postun antler
+if [ $1 -eq 0 ] ; then
+ /usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
+fi
+
+%posttrans antler
+/usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
%files -f caribou.lang
%doc NEWS COPYING README
@@ -152,6 +162,12 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
%changelog
+*Tue Dec 18 2012 Parag Nemade <pnemade AT redhat DOT com> - 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..
+- Resolves:rh#880382
+
* Wed Nov 21 2012 Parag Nemade <pnemade AT redhat DOT com> - 0.4.4.2-6
- Resolves:rh#878716 - need some spec cleanup
diff --git a/sources b/sources
index ffcd546..8394e3d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-02f6c153723ab89f67d5644df6c27b52 caribou-0.4.4.2.tar.xz
+e37ba22b9a68e1f1b572797b7664c116 caribou-0.4.5.tar.xz
More information about the scm-commits
mailing list