From 5b4c9ed0b630d6e90e09ab45ed3deaf38b23806bcc27db0d5c26bd824c7be9b8 Mon Sep 17 00:00:00 2001
From: Jan Arne Petersen <jpetersen@jpetersen.org>
Date: Mon, 4 Jun 2012 10:16:01 +0000
Subject: [PATCH] Add maliit.conf

OBS-URL: https://build.opensuse.org/package/show/M17N:Maliit/maliit-framework?expand=0&rev=64
---
 maliit-framework.spec | 29 +++++++++++++++++++++++++----
 maliit.conf           | 11 +++++++++++
 2 files changed, 36 insertions(+), 4 deletions(-)
 create mode 100644 maliit.conf

diff --git a/maliit-framework.spec b/maliit-framework.spec
index ebb1024..a28cf9a 100644
--- a/maliit-framework.spec
+++ b/maliit-framework.spec
@@ -5,6 +5,8 @@
   %define _qt4_translationdir %(qmake -query QT_INSTALL_TRANSLATIONS)
 %endif
 
+%define _xinputconf %{_sysconfdir}/X11/xinit/xinput.d/maliit.conf
+
 Name:           maliit-framework
 Version:        0.92.1
 Release:        1%{dist}
@@ -14,6 +16,7 @@ Group:          System Environment/Libraries
 License:        LGPLv2
 URL:            http://www.maliit.org
 Source0:        http://maliit.org/releases/maliit-framework/%{name}-%{version}.tar.bz2
+Source1:        maliit.conf
 
 BuildRequires:  pkgconfig(QtCore) >= 4.7.0
 BuildRequires:  pkgconfig(QtDeclarative)
@@ -48,6 +51,9 @@ Requires(preun):  /usr/bin/gconftool-2
 Requires(post):   /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
+Requires(post):  %{_sbindir}/alternatives
+Requires(postun):  %{_sbindir}/alternatives
+
 %description
 Core server and libraries for the Maliit Input Methods Framework
 
@@ -169,7 +175,8 @@ Gtk+ plugin for basic Gtk+ version 3 toolkit support
                  M_IM_INSTALL_HEADERS=%{_includedir} \
                  M_IM_INSTALL_SCHEMAS=%{_sysconfdir}/gconf/schemas \
                  M_IM_ENABLE_MULTITOUCH=false \
-                 CONFIG+=disable-gtk-cache-update
+                 CONFIG+=disable-gtk-cache-update \
+                 CONFIG+=disable-dbus-activation \
 
 make %{?_smp_mflags}
 
@@ -180,6 +187,9 @@ make install INSTALL="install -p" INSTALL_ROOT=%{buildroot}
 # Make dir for plugins
 mkdir -p %{buildroot}%{_libdir}/maliit/plugins-0.80/
 
+# install xinput config file
+install -pm 644 -D %{SOURCE1} $RPM_BUILD_ROOT%{_xinputconf}
+
 %if 0%{?suse_version}
 %find_gconf_schemas
 %endif
@@ -203,12 +213,20 @@ rm -rf %{buildroot}
 %preun
 %gconf_schema_remove maliit-framework
 
-%post 
+%post
 /sbin/ldconfig
+%{_sbindir}/alternatives --install %{_sysconfdir}/X11/xinit/xinputrc xinputrc %{_xinputconf} 83 || :
+
 %gconf_schema_upgrade maliit-framework
 %endif
 
-%postun -p /sbin/ldconfig
+%postun
+if [ "$1" -eq 0 ]; then
+    %{_sbindir}/alternatives --remove xinputrc %{_xinputconf} || :
+    # if alternative was set to manual, reset to auto
+    [ -L %{_sysconfdir}/alternatives/xinputrc -a "`readlink %{_sysconfdir}/alternatives/xinputrc`" = "%{_xinputconf}" ] && %{_sbindir}/alternatives --auto xinputrc || :
+fi
+/sbin/ldconfig
 
 %post -n libmaliit-1_0-0 -p /sbin/ldconfig
 
@@ -246,10 +264,10 @@ rm -rf %{buildroot}
 %{_libdir}/libmaliit-plugins-1.0.so.*
 %{_libdir}/libmaliit-plugins-quick-0.80.so.*
 %{_libdir}/maliit/plugins-1.0/factories/libmaliit-plugins-quick-factory-0.80.so
-%{_datadir}/dbus-1/services/org.maliit.server.service
 %if 0%{?fedora}
 %{_sysconfdir}/gconf/schemas/maliit-framework.schemas
 %endif
+%config %{_xinputconf}
 
 %files devel
 %defattr(-,root,root,-)
@@ -339,6 +357,9 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Mon Jun 04 2012 Jan Arne Petersen <jpetersen@openismus.com> - 0.92.1-1
+- Add xinput maliit.conf
+
 * Fri Jun 01 2012 Michael Hasselmann <michaelh@openismus.com> - 0.92.1-0
 - Update to 0.92.1
 
diff --git a/maliit.conf b/maliit.conf
new file mode 100644
index 0000000..726af26
--- /dev/null
+++ b/maliit.conf
@@ -0,0 +1,11 @@
+XIM=maliit
+XIM_PROGRAM=/usr/bin/maliit-server
+XIM_ARGS=
+
+#PREFERENCE_PROGRAM=/usr/bin/maliit-settings-gtk
+
+SHORT_DESC="Maliit"
+LONG_DESC="Maliit - Flexible and cross-platform input method framework for mobile text input"
+
+GTK_IM_MODULE=Maliit
+QT_IM_MODULE=Maliit