rpms/gtk2/devel im-cedilla.conf,NONE,1.1 gtk2.spec,1.383,1.384

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/gtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2296

Modified Files:
	gtk2.spec 
Added Files:
	im-cedilla.conf 
Log Message:
add imsettings config file for im-cedilla



--- NEW FILE im-cedilla.conf ---
XIM=none
XIM_PROGRAM=/bin/true
XIM_ARGS=
SHORT_DESC=im-cedilla
GTK_IM_MODULE=cedilla
QT_IM_MODULE=xim


Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.383
retrieving revision 1.384
diff -u -p -r1.383 -r1.384
--- gtk2.spec	8 Jul 2009 05:47:59 -0000	1.383
+++ gtk2.spec	10 Jul 2009 13:17:11 -0000	1.384
@@ -17,12 +17,13 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.17/gtk+-%{version}.tar.bz2
 Source1: update-gdk-pixbuf-loaders
 Source2: update-gtk-immodules
+Source3: im-cedilla.conf
 
 # Biarch changes
 Patch0: gtk+-2.13.5-lib64.patch
@@ -86,6 +87,8 @@ suites.
 Summary: Input methods for GTK+
 Group: System Environment/Libraries
 Requires: gtk2 = %{version}-%{release}
+# for /etc/X11/xinit/xinput.d
+Requires: imsettings
 
 %description immodules
 The gtk2-immodules package contains standalone input methods that are shipped
@@ -243,12 +246,14 @@ case "$host" in
    ;;
 esac
 
-#
 # Install wrappers for the binaries
-#
 cp %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/update-gdk-pixbuf-loaders
 cp %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/update-gtk-immodules
 
+# Input method frameworks want this
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d
+cp %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d
+
 # Remove unpackaged files
 rm $RPM_BUILD_ROOT%{_libdir}/*.la
 rm $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/*/*.la
@@ -344,6 +349,7 @@ fi
 %{_libdir}/gtk-2.0/%{bin_version}/immodules/im-ti-er.so
 %{_libdir}/gtk-2.0/%{bin_version}/immodules/im-ti-et.so
 %{_libdir}/gtk-2.0/%{bin_version}/immodules/im-viqr.so
+%{_sysconfdir}/X11/xinit/xinput.d/im-cedilla.conf
 %config(noreplace) %{_sysconfdir}/gtk-2.0/im-multipress.conf
 
 %files immodule-xim
@@ -373,6 +379,9 @@ fi
 
 
 %changelog
+* Fri Jul 10 2009 Matthias Clasen <mclasen at redhat.com> - 2.17.3-3
+- Add an imsettings conf file for im-cedilla
+
 * Wed Jul  8 2009 Matthias Clasen <mclasen at redhat.com> - 2.17.3-2
 - Some fixes for drawing issues, e.g. with statusicons