[caribou] Update to 0.4.8
pnemade
pnemade at fedoraproject.org
Tue Feb 19 05:11:39 UTC 2013
commit c339e35866fe67147fa4736911c1cbad035d7ce2
Author: Parag Nemade <pnemade at redhat.com>
Date: Tue Feb 19 10:43:26 2013 +0530
Update to 0.4.8
.gitignore | 1 +
caribou-0.4.6-fix-python-exec.patch | 32 ------------
caribou-0.4.8-fix-python-exec.patch | 23 +++++++++
...-multilib.patch => caribou-0.4.8-multilib.patch | 51 ++++----------------
caribou.spec | 15 +++---
sources | 2 +-
6 files changed, 43 insertions(+), 81 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7fb1512..c6dc40d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ caribou-0.1.5.tar.bz2
/caribou-0.4.5.tar.xz
/caribou-0.4.6.tar.xz
/caribou-0.4.7.tar.xz
+/caribou-0.4.8.tar.xz
diff --git a/caribou-0.4.8-fix-python-exec.patch b/caribou-0.4.8-fix-python-exec.patch
new file mode 100644
index 0000000..5edba21
--- /dev/null
+++ b/caribou-0.4.8-fix-python-exec.patch
@@ -0,0 +1,23 @@
+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
+
+- at 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
+
+- at 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.8-multilib.patch
similarity index 56%
rename from caribou-0.4.6-multilib.patch
rename to caribou-0.4.8-multilib.patch
index d81e260..f5b24f5 100644
--- a/caribou-0.4.6-multilib.patch
+++ b/caribou-0.4.8-multilib.patch
@@ -1,7 +1,7 @@
-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 @@
+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
@@ -18,10 +18,11 @@ diff -urN caribou-0.4.6.orig/bin/antler-keyboard.in caribou-0.4.6/bin/antler-key
+;;
+esac
+
++
script_dir="$(dirname "$(readlink -f ${0})")"
prefix=@prefix@
-@@ -27,8 +40,8 @@
+@@ -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 at PYTHON_VERSION@/site-packages:${prefix}/lib64/python at PYTHON_VERSION@/site-packages${PYTHONPATH:+:$PYTHONPATH}"
@@ -32,41 +33,9 @@ diff -urN caribou-0.4.6.orig/bin/antler-keyboard.in caribou-0.4.6/bin/antler-key
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 at 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
+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
@@ -87,7 +56,7 @@ diff -urN caribou-0.4.6.orig/bin/caribou-preferences.in caribou-0.4.6/bin/caribo
script_dir="$(dirname "$(readlink -f ${0})")"
prefix=@prefix@
-@@ -27,8 +40,8 @@
+@@ -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 at PYTHON_VERSION@/site-packages${PYTHONPATH:+:$PYTHONPATH}"
diff --git a/caribou.spec b/caribou.spec
index 4527f9b..2e10b72 100644
--- a/caribou.spec
+++ b/caribou.spec
@@ -1,12 +1,12 @@
Name: caribou
-Version: 0.4.7
-Release: 3%{?dist}
+Version: 0.4.8
+Release: 1%{?dist}
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.6-multilib.patch
-Patch1: caribou-0.4.6-fix-python-exec.patch
+Patch0: caribou-0.4.8-multilib.patch
+Patch1: caribou-0.4.8-fix-python-exec.patch
BuildRequires: python2-devel
BuildRequires: gtk2-devel
@@ -22,6 +22,7 @@ BuildRequires: libXtst-devel
BuildRequires: libxklavier-devel
BuildRequires: libgee-devel
BuildRequires: gobject-introspection-devel
+BuildRequires: at-spi2-core-devel
Requires: python-%{name} = %{version}-%{release}
Requires: gobject-introspection
@@ -96,8 +97,6 @@ make %{?_smp_mflags}
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
-echo "NoDisplay=true" >> $RPM_BUILD_ROOT%{_datadir}/applications/caribou.desktop
-desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/caribou.desktop
desktop-file-validate $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/caribou-autostart.desktop || :
desktop-file-validate $RPM_BUILD_ROOT%{_libdir}/gnome-settings-daemon-3.0/gtk-modules/caribou-gtk-module.desktop || :
@@ -128,7 +127,6 @@ fi
%{_bindir}/caribou-preferences
%{_datadir}/caribou
%{_libdir}/girepository-1.0/Caribou-1.0.typelib
-%{_datadir}/applications/caribou.desktop
%{_sysconfdir}/xdg/autostart/caribou-autostart.desktop
%{_datadir}/glib-2.0/schemas/org.gnome.caribou.gschema.xml
%{_libdir}/libcaribou.so.0*
@@ -158,6 +156,9 @@ fi
%changelog
+* Tue Feb 19 2013 Parag Nemade <pnemade AT redhat DOT com> - 0.4.8-1
+- Update to 0.4.8
+
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.7-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
diff --git a/sources b/sources
index 2143544..c6aa6d9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3f27abc0f303b531825104b456660378 caribou-0.4.7.tar.xz
+f43717157c8f4f77a0503f1c54d42abb caribou-0.4.8.tar.xz
More information about the scm-commits
mailing list