rpms/gtk2/F-11 im-cedilla.conf,NONE,1.1 gtk2.spec,1.382,1.383

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/gtk2/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23617

Modified Files:
	gtk2.spec 
Added Files:
	im-cedilla.conf 
Log Message:
Add im-cedilla.conf to gtk2-immodules



--- 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/F-11/gtk2.spec,v
retrieving revision 1.382
retrieving revision 1.383
diff -u -p -r1.382 -r1.383
--- gtk2.spec	29 Aug 2009 14:55:35 -0000	1.382
+++ gtk2.spec	4 Sep 2009 01:19:23 -0000	1.383
@@ -17,12 +17,13 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.16/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
@@ -249,6 +252,11 @@ esac
 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 +352,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 +382,9 @@ fi
 
 
 %changelog
+* Thu Sep  3 2009 Matthias Clasen <mclasen at redhat.com> - 2.16.6-2
+- Add im-cedilla.conf to gtk2-immodules (#510666)
+
 * Sat Aug 29 2009 Matthias Clasen <mclasen at redhat.com> - 2.16.6-1
 - Update to 2.16.6