diff --git a/.caribou.metadata b/.caribou.metadata new file mode 100644 index 0000000..acfad20 --- /dev/null +++ b/.caribou.metadata @@ -0,0 +1 @@ +ba10a7a2d7608008ffe4461826252792facf90c4 SOURCES/caribou-0.4.21.tar.xz diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b3a1dee --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/caribou-0.4.21.tar.xz diff --git a/SOURCES/caribou-0.4.20-fix-python-exec.patch b/SOURCES/caribou-0.4.20-fix-python-exec.patch new file mode 100644 index 0000000..806e57a --- /dev/null +++ b/SOURCES/caribou-0.4.20-fix-python-exec.patch @@ -0,0 +1,21 @@ +diff -urN caribou-0.4.20.old/bin/antler-keyboard.in caribou-0.4.20/bin/antler-keyboard.in +--- caribou-0.4.20.old/bin/antler-keyboard.in 2016-06-27 19:31:55.547580177 +0530 ++++ caribou-0.4.20/bin/antler-keyboard.in 2016-06-27 19:37:00.369738066 +0530 +@@ -38,4 +38,4 @@ + export ANTLER_THEME_PATH="$(dirname $script_dir)/data" + fi + +-@PYTHON@ -m caribou.antler.main "$@" ++exec @PYTHON@ -m caribou.antler.main "$@" +diff -urN caribou-0.4.20.old/bin/caribou-preferences.in caribou-0.4.20/bin/caribou-preferences.in +--- caribou-0.4.20.old/bin/caribou-preferences.in 2016-06-27 19:31:55.547580177 +0530 ++++ caribou-0.4.20/bin/caribou-preferences.in 2016-06-27 19:37:14.392561317 +0530 +@@ -37,7 +37,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/SOURCES/caribou-0.4.20-multilib.patch b/SOURCES/caribou-0.4.20-multilib.patch new file mode 100644 index 0000000..101234a --- /dev/null +++ b/SOURCES/caribou-0.4.20-multilib.patch @@ -0,0 +1,68 @@ +diff -urN caribou-0.4.20.old/bin/antler-keyboard.in caribou-0.4.20/bin/antler-keyboard.in +--- caribou-0.4.20.old/bin/antler-keyboard.in 2016-06-27 19:40:02.959436627 +0530 ++++ caribou-0.4.20/bin/antler-keyboard.in 2016-06-27 19:47:32.697767930 +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@ +@@ -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@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.20.old/bin/caribou-preferences.in caribou-0.4.20/bin/caribou-preferences.in +--- caribou-0.4.20.old/bin/caribou-preferences.in 2016-06-27 19:40:02.959436627 +0530 ++++ caribou-0.4.20/bin/caribou-preferences.in 2016-06-27 19:48:58.525983390 +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@ +@@ -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@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/SPECS/caribou.spec b/SPECS/caribou.spec new file mode 100644 index 0000000..fb70429 --- /dev/null +++ b/SPECS/caribou.spec @@ -0,0 +1,367 @@ +Name: caribou +Version: 0.4.21 +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 +Patch1: caribou-0.4.20-fix-python-exec.patch +Patch2: caribou-0.4.20-multilib.patch + +BuildRequires: gtk2-devel +BuildRequires: gtk3-devel +BuildRequires: pygobject3-devel +BuildRequires: intltool +BuildRequires: gnome-doc-utils +BuildRequires: desktop-file-utils +BuildRequires: gettext +BuildRequires: clutter-devel +BuildRequires: vala-devel +BuildRequires: libXtst-devel +BuildRequires: libxklavier-devel +BuildRequires: libgee-devel +BuildRequires: gobject-introspection-devel +BuildRequires: at-spi2-core-devel + +%if 0%{?rhel} +Requires: python2-%{name} = %{version}-%{release} +%else +# Changed in F23 to pull python3-caribou default +Requires: python3-%{name} = %{version}-%{release} +%endif +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 +# Obsolete retired 'gok' to make sure it gets removed with distro upgrade +Obsoletes: gok < 2.30.1-6 + +%description +Caribou is a text entry application that currently manifests itself as +a simplified in-place on-screen keyboard. + +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +# Obsolete retired 'gok' to make sure it gets removed with distro upgrade +Obsoletes: gok-devel < 2.30.1-6 + +%description devel +The %{name}-devel package contains libraries and header files for +developing applications that use %{name}. + +%package -n python2-caribou +Summary: Keyboard UI for %{name} +BuildRequires: python2-devel +Requires: pygobject3 +Requires: pyatspi +Requires: %{name} = %{version}-%{release} +Obsoletes: caribou < 0.4.1-3 +Obsoletes: python-caribou < 0.4.20-2 +Provides: python-caribou = %{version} +BuildArch: noarch + +%description -n python2-caribou +This package contains caribou python GUI + +%if !0%{?rhel} +%package -n python3-caribou +Summary: Keyboard UI for %{name} +BuildRequires: python3-devel +BuildRequires: python3-gobject +Requires: python3-gobject +Requires: python3-pyatspi +Requires: %{name} = %{version}-%{release} +Obsoletes: caribou < 0.4.1-3 +BuildArch: noarch + +%description -n python3-caribou +This package contains caribou python3 GUI +%endif + +%package gtk2-module +Summary: Gtk2 module for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +Obsoletes: caribou < 0.4.1-3 + +%description gtk2-module +This package contains caribou module for gtk2 applications. + +%package gtk3-module +Summary: Gtk3 module for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +Obsoletes: caribou < 0.4.1-3 + +%description gtk3-module +This package contains caribou module for gtk3 applications. + +%package antler +Summary: Keyboard implementation for %{name} +%if 0%{?rhel} +Requires: python2-%{name} = %{version}-%{release} +%else +Requires: python3-%{name} = %{version}-%{release} +%endif +Obsoletes: caribou < 0.4.1-3 + +%description antler +This package contains caribou keyboard implementation for +non-gnome-shell sessions. + +%prep +%setup -q +%patch1 -p1 -b .fix-python-exec +%patch2 -p1 -b .multilib + +%build +%configure --disable-static +make V=1 %{?_smp_mflags} + +%install +make install DESTDIR=%{buildroot} INSTALL="install -p" + +%if !0%{?rhel} +# For Python3 +make clean +%configure --disable-static PYTHON=python3 +make install DESTDIR=%{buildroot} INSTALL="install -p" +%endif + +find %{buildroot} -name '*.la' -exec rm -f {} ';' + +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 || : + +%find_lang caribou + +%post -p /sbin/ldconfig + +%postun +/sbin/ldconfig +if [ $1 -eq 0 ] ; then + /usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : +fi + +%posttrans +/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 README +%license COPYING +%{_bindir}/caribou-preferences +%{_datadir}/caribou +%{_libdir}/girepository-1.0/Caribou-1.0.typelib +%{_sysconfdir}/xdg/autostart/caribou-autostart.desktop +%{_datadir}/dbus-1/services/org.gnome.Caribou.Daemon.service +%{_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 +%{_libexecdir}/caribou + +%files -n python2-caribou +%{python2_sitelib}/caribou + +%if !0%{?rhel} +%files -n python3-caribou +%{python3_sitelib}/caribou +%endif + +%files devel +%{_includedir}/* +%{_libdir}/*.so +%{_libdir}/pkgconfig/caribou-1.0.pc +%{_datadir}/gir-1.0/Caribou-1.0.gir +%{_datadir}/vala + +%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 +* Wed Oct 19 2016 Kalev Lember - 0.4.21-1 +- Update to 0.4.21 +- Resolves: #1386821 + +* Mon Mar 23 2015 Richard Hughes - 0.4.16-1 +- Update to 0.4.16 +- Resolves: #1174709 + +* Tue Aug 19 2014 Parag Nemade - 0.4.11-5 +- Resolves:rh#1054596 - Untranslated strings found + +* Mon Aug 18 2014 Parag Nemade - 0.4.11-4 +- Resolves:rh#1054596 - Untranslated strings found + +* Fri Jan 24 2014 Daniel Mach - 0.4.11-3 +- Mass rebuild 2014-01-24 + +* Fri Dec 27 2013 Daniel Mach - 0.4.11-2 +- Mass rebuild 2013-12-27 + +* Mon Jun 10 2013 Parag Nemade - 0.4.11-1 +- Update to 0.4.11 + +* Wed Mar 20 2013 Parag Nemade - 0.4.10-1 +- Update to 0.4.10 + +* Mon Mar 04 2013 Parag Nemade - 0.4.9-1 +- Update to 0.4.9 + +* Thu Feb 21 2013 Kalev Lember - 0.4.8-2 +- Rebuilt for cogl soname bump + +* Tue Feb 19 2013 Parag Nemade - 0.4.8-1 +- Update to 0.4.8 + +* Wed Feb 13 2013 Fedora Release Engineering - 0.4.7-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Jan 16 2013 Parag Nemade - 0.4.7-2 +- vala .vapi and .deps files should be installed by -devel + +* Wed Jan 16 2013 Parag Nemade - 0.4.7-1 +- Update to 0.4.7 + +* 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.. +- Resolves:rh#880382 + +* Wed Nov 21 2012 Parag Nemade - 0.4.4.2-6 +- Resolves:rh#878716 - need some spec cleanup + +* Thu Nov 15 2012 Parag Nemade - 0.4.4.2-5 +- Apply patch1 + +* Tue Nov 13 2012 Parag Nemade - 0.4.4.2-4 +- Patch from Rui Matos for exec python in shell shim scripts + +* Tue Nov 13 2012 Parag Nemade - 0.4.4.2-3 +- Fix multilib patch + +* Tue Nov 13 2012 Rui Matos - 0.4.4.2-2 +- Fix dependencies, caribou and antler both need python-caribou + +* Tue Nov 13 2012 Parag Nemade - 0.4.4.2-1 +- Update to 0.4.4.2 release + +* Thu Sep 06 2012 Richard Hughes - 0.4.4-1 +- Update to 0.4.4 + +* Wed Jul 25 2012 Kalev Lember - 0.4.3-3 +- Correct the obsoletes + +* Tue Jul 24 2012 Kalev Lember - 0.4.3-2 +- Obsolete gok + +* Thu Jul 19 2012 Parag Nemade - 0.4.3-1 +- Update to 0.4.3 release + +* Wed Jul 18 2012 Fedora Release Engineering - 0.4.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Tue Mar 27 2012 Parag Nemade - 0.4.2-1 +- Update to 0.4.2 release + +* Tue Feb 07 2012 Parag Nemade - 0.4.1-5 +- Resolves:rh#768033 - Update Requires for caribou + +* Thu Jan 12 2012 Fedora Release Engineering - 0.4.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Fri Dec 09 2011 Parag Nemade - 0.4.1-3 +- split package to subpackages -gtk2-module, -gtk3-module, -antler and python-caribou + +* Thu Nov 17 2011 Parag Nemade - 0.4.1-2 +- Resolves:rh#753149 - Upgraded F15 -> F16 gnome fails - wrong version of caribou + +* Tue Oct 18 2011 Parag Nemade - 0.4.1-1 +- upstream release 0.4.1 + +* Tue Sep 27 2011 Parag Nemade - 0.4.0-1 +- upstream release 0.4.0 + +* Tue Sep 20 2011 Parag Nemade - 0.3.92-1 +- upstream release 0.3.92 + +* Tue Sep 06 2011 Parag Nemade - 0.3.91-1 +- Update to new upstream release 0.3.91 + +* Wed Aug 31 2011 Matthias Clasen - 0.3.5-2 +- Rebuild with pygobject3 + +* Thu Aug 18 2011 Matthias Clasen - 0.3.5-1 +- Update to 0.3.5 + +* Tue Jul 05 2011 Parag Nemade - 0.3.3-1 +- Update to new upstream release 0.3.3 + +* Thu Jun 16 2011 Tomas Bzatek - 0.3.2-2 +- Tweak BuildRequires + +* Tue Jun 14 2011 Parag Nemade - 0.3.2-1 +- Update to new upstream release 0.3.2 + +* Fri May 6 2011 Christopher Aillon - 0.2.00-3 +- Update scriptlets per packaging guidelines + +* Thu May 05 2011 Parag Nemade - 0.2.00-2 +- Caribou now only be shown in GNOME. (rh#698603) +- Add desktop-file-validate for caribou-autostart.desktop +- Add ||: for caribou-autostart.desktop to skip the error. + +* Tue Apr 5 2011 Matthias Clasen - 0.2.00-1 +- Update to 0.2.00 + +* Tue Mar 22 2011 Parag Nemade - 0.1.92-1 +- Update to 0.1.92 + +* Thu Mar 10 2011 Parag Nemade - 0.1.91-1 +- Update to 0.1.91 + +* Thu Mar 10 2011 Parag Nemade - 0.1.7-1 +- Update to 0.1.7 + +* Tue Feb 08 2011 Fedora Release Engineering - 0.1.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Wed Jul 21 2010 David Malcolm - 0.1.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild + +* Mon Jul 12 2010 Matthias Clasen - 0.1.5-1 +- Update to 0.1.5 + +* Wed Jun 16 2010 Matthias Clasen - 0.1.2-3 +- Require pyatspi, not at-spi-python + +* Sat May 29 2010 Matthias Clasen - 0.1.2-2 +- Rewrite spec for autotools + +* Fri May 28 2010 Matthias Clasen - 0.1.2-1 +- Update to 0.1.2 + +* Wed Jan 21 2009 Ben Konrath - 0.0.2-1 +- Initial release.