[caribou/f16] split package to subpackages -gtk2-module, -gtk3-module, -antler and python-caribou
pnemade
pnemade at fedoraproject.org
Fri Dec 9 09:52:05 UTC 2011
commit 44ad4596e4db7604daed627f3d23895d24c6bf2d
Author: Parag Nemade <pnemade at redhat.com>
Date: Fri Dec 9 15:21:53 2011 +0530
split package to subpackages -gtk2-module, -gtk3-module, -antler and python-caribou
caribou-0.4.1-multilib.patch | 102 ++++++++++++++++++++++++++++++++++++++++++
caribou.spec | 76 +++++++++++++++++++++++++------
2 files changed, 164 insertions(+), 14 deletions(-)
---
diff --git a/caribou-0.4.1-multilib.patch b/caribou-0.4.1-multilib.patch
new file mode 100644
index 0000000..0f26401
--- /dev/null
+++ b/caribou-0.4.1-multilib.patch
@@ -0,0 +1,102 @@
+diff -urN caribou-0.4.1.old/bin/antler-keyboard.in caribou-0.4.1/bin/antler-keyboard.in
+--- caribou-0.4.1.old/bin/antler-keyboard.in 2011-10-10 02:08:14.000000000 +0530
++++ caribou-0.4.1/bin/antler-keyboard.in 2011-12-06 15:32:55.517736521 +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 ${BASH_SOURCE[0]})")"
+
+ prefix=@prefix@
+@@ -27,9 +40,9 @@
+ 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}"
+- 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="$LIB_DIR${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.1.old/bin/caribou.in caribou-0.4.1/bin/caribou.in
+--- caribou-0.4.1.old/bin/caribou.in 2011-10-10 02:08:14.000000000 +0530
++++ caribou-0.4.1/bin/caribou.in 2011-12-06 15:37:16.757085822 +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 ${BASH_SOURCE[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.1.old/bin/caribou-preferences.in caribou-0.4.1/bin/caribou-preferences.in
+--- caribou-0.4.1.old/bin/caribou-preferences.in 2011-10-10 02:08:14.000000000 +0530
++++ caribou-0.4.1/bin/caribou-preferences.in 2011-12-06 15:37:44.754230253 +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 ${BASH_SOURCE[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 at 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 b7127a9..da51473 100644
--- a/caribou.spec
+++ b/caribou.spec
@@ -1,12 +1,13 @@
Name: caribou
Version: 0.4.1
-Release: 2%{?dist}
+Release: 3%{?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.1-multilib.patch
BuildRequires: python-devel
BuildRequires: gtk2-devel
@@ -14,7 +15,6 @@ BuildRequires: gtk3-devel
BuildRequires: pygobject3-devel
BuildRequires: pyclutter-devel
BuildRequires: pyatspi
-BuildRequires: python-virtkey
BuildRequires: intltool
BuildRequires: gnome-doc-utils
BuildRequires: desktop-file-utils
@@ -23,7 +23,6 @@ BuildRequires: clutter-devel
BuildRequires: vala-devel
BuildRequires: libXtst-devel
BuildRequires: libxklavier-devel
-BuildRequires: json-glib-devel
BuildRequires: libgee-devel
BuildRequires: gobject-introspection-devel
@@ -34,7 +33,7 @@ Requires: pyclutter
Requires: python-virtkey
#Following is needed as package moved from noarch to arch
-Obsoletes: caribou < 0.4.1-2
+Obsoletes: caribou < 0.4.1-3
%description
Caribou is a text entry application that currently manifests itself as
@@ -49,9 +48,46 @@ Requires: %{name} = %{version}-%{release}
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.
+%package -n python-caribou
+Summary: Keyboard UI for %{name}
+Group: System Environment/Libraries
+Requires: %{name} = %{version}-%{release}
+Obsoletes: caribou < 0.4.1-3
+BuildArch: noarch
+
+%description -n python-caribou
+This package contains caribou python GUI
+
+%package gtk2-module
+Summary: Gtk2 im module for %{name}
+Group: System Environment/Libraries
+Requires: %{name} = %{version}-%{release}
+Obsoletes: caribou < 0.4.1-3
+
+%description gtk2-module
+This package contains caribou im module for gtk2
+
+%package gtk3-module
+Summary: Gtk3 im module for %{name}
+Group: System Environment/Libraries
+Requires: %{name} = %{version}-%{release}
+Obsoletes: caribou < 0.4.1-3
+
+%description gtk3-module
+This package contains caribou im module for gtk3
+
+%package antler
+Summary: Keyboard implementation for %{name}
+Group: User Interface/Desktops
+Requires: %{name} = %{version}-%{release}
+Obsoletes: caribou < 0.4.1-3
+
+%description antler
+This package contains caribou keyboard implementation
+
%prep
%setup -q
-
+%patch0 -p1 -b .multilib
%build
%configure --disable-static
@@ -62,7 +98,6 @@ 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
-echo "OnlyShowIn=GNOME;" >> $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/caribou-autostart.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 || :
@@ -82,28 +117,41 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
%files -f caribou.lang
%doc NEWS COPYING README
-%{python_sitelib}/caribou
%{_bindir}/caribou
%{_bindir}/caribou-preferences
%{_datadir}/caribou
-%{_datadir}/antler
-%{_datadir}/dbus-1/services/org.gnome.Caribou.Antler.service
-%{_libexecdir}/antler-keyboard
%{_libdir}/girepository-1.0/Caribou-1.0.typelib
%{_datadir}/applications/caribou.desktop
%{_sysconfdir}/xdg/autostart/caribou-autostart.desktop
-%{_datadir}/glib-2.0/schemas/*
-%{_libdir}/*.so.*
-%{_libdir}/gtk-2.0/modules/libcaribou-gtk-module.so
-%{_libdir}/gtk-3.0/modules/libcaribou-gtk-module.so
+%{_datadir}/glib-2.0/schemas/org.gnome.caribou.gschema.xml
+%{_libdir}/libcaribou.so.0*
%{_libdir}/gnome-settings-daemon-3.0/gtk-modules/caribou-gtk-module.desktop
+%files -n python-caribou
+%{python_sitelib}/caribou
+
%files devel
%{_includedir}/*
%{_libdir}/*.so
%{_datadir}/gir-1.0/Caribou-1.0.gir
+%files gtk2-module
+%{_libdir}/gtk-2.0/modules/libcaribou-gtk-module.so
+
+%files gtk3-module
+%{_libdir}/gtk-3.0/modules/libcaribou-gtk-module.so
+
+%files antler
+%{_datadir}/antler
+%{_datadir}/dbus-1/services/org.gnome.Caribou.Antler.service
+%{_libexecdir}/antler-keyboard
+%{_datadir}/glib-2.0/schemas/org.gnome.antler.gschema.xml
+
+
%changelog
+* Fri Dec 09 2011 Parag Nemade <pnemade AT redhat.com> - 0.4.1-3
+- split package to subpackages -gtk2-module, -gtk3-module, -antler and python-caribou
+
* Thu Nov 17 2011 Parag Nemade <pnemade AT redhat.com> - 0.4.1-2
- Resolves:rh#753149 - Upgraded F15 -> F16 gnome fails - wrong version of caribou
More information about the scm-commits
mailing list