From 0ef7cddb98e6213b0b8bf7615c98d3b9cf3ad68d Mon Sep 17 00:00:00 2001
From: leigh123linux <leigh123linux@googlemail.com>
Date: Apr 28 2018 08:36:10 +0000
Subject: Change autostart as gnome-shell has it's own builtin OSK application


---

diff --git a/caribou.spec b/caribou.spec
index d444301..aa21dd7 100644
--- a/caribou.spec
+++ b/caribou.spec
@@ -1,12 +1,14 @@
 Name:           caribou
 Version:        0.4.21
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        A simplified in-place on-screen keyboard
 License:        LGPLv2+
 URL:            https://wiki.gnome.org/Projects/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
+# caribou isn't needed in gnome-shell so don't start there
+Patch3:         change_autostart_cinnamon.patch
 
 BuildRequires:  gtk2-devel
 BuildRequires:  gtk3-devel
@@ -117,7 +119,7 @@ non-gnome-shell sessions.
 
 %build
 %configure --disable-static
-make V=1 %{?_smp_mflags}
+%make_build
 
 %install
 make install DESTDIR=%{buildroot} INSTALL="install -p"
@@ -126,7 +128,7 @@ make install DESTDIR=%{buildroot} INSTALL="install -p"
 # For Python3
 make clean
 %configure --disable-static PYTHON=python3
-make install DESTDIR=%{buildroot} INSTALL="install -p"
+%make_install
 %endif
 
 find %{buildroot} -name '*.la' -exec rm -f {} ';'
@@ -180,6 +182,10 @@ desktop-file-validate $RPM_BUILD_ROOT%{_libdir}/gnome-settings-daemon-3.0/gtk-mo
 
 
 %changelog
+* Sat Apr 28 2018 Leigh Scott <leigh123linux@googlemail.com> - 0.4.21-8
+- Unretire
+- Change autostart as gnome-shell has it's own builtin OSK application
+
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.21-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 
diff --git a/change_autostart_cinnamon.patch b/change_autostart_cinnamon.patch
new file mode 100644
index 0000000..f55ddd2
--- /dev/null
+++ b/change_autostart_cinnamon.patch
@@ -0,0 +1,13 @@
+--- a/data/caribou-autostart.desktop.in.in
++++ b/data/caribou-autostart.desktop.in.in
+@@ -2,7 +2,7 @@
+ Type=Application
+ Name=Caribou
+ Exec=@libexecdir@/caribou
+-AutostartCondition=GSettings org.gnome.desktop.a11y.applications screen-keyboard-enabled
++AutostartCondition=GSettings org.cinnamon.desktop.a11y.applications screen-keyboard-enabled
+ X-GNOME-AutoRestart=true
+ #X-GNOME-Autostart-Phase=Initialization
+-OnlyShowIn=GNOME;Unity;
++OnlyShowIn=X-Cinnamon;
+