[imsettings/f14] fix FTBFS in F-14 with patch from F-15

[Peter Robinson]

commit 8fa3125a8c5d88d0ec302ac5ce100dd1623c2bc8
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Mon Jul 4 16:28:35 2011 +0100

    fix FTBFS in F-14 with patch from F-15

 imsettings-fix-build.patch |   11 +++++++++++
 imsettings.spec            |   12 ++++++++++--
 2 files changed, 21 insertions(+), 2 deletions(-)
---
diff --git a/imsettings-fix-build.patch b/imsettings-fix-build.patch
new file mode 100644
index 0000000..e82a739
--- /dev/null
+++ b/imsettings-fix-build.patch
@@ -0,0 +1,11 @@
+diff -pruN imsettings-0.108.1.orig/imsettings/imsettings-utils.h imsettings-0.108.1/imsettings/imsettings-utils.h
+--- imsettings-0.108.1.orig/imsettings/imsettings-utils.h	2010-08-02 18:24:45.000000000 +0900
++++ imsettings-0.108.1/imsettings/imsettings-utils.h	2010-11-04 19:23:52.000000000 +0900
+@@ -25,7 +25,6 @@
+ #define __IMSETTINGS_IMSETTINGS_UTILS_H__
+ 
+ #include <glib.h>
+-#include <dbus/dbus.h>
+ 
+ G_BEGIN_DECLS
+ 
diff --git a/imsettings.spec b/imsettings.spec
index 6d3a641..c949ff8 100644
--- a/imsettings.spec
+++ b/imsettings.spec
@@ -1,6 +1,6 @@
 Name:		imsettings
 Version:	0.108.1
-Release:	2%{?dist}
+Release:	4%{?dist}
 License:	LGPLv2+
 URL:		http://code.google.com/p/imsettings/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -20,6 +20,7 @@ Source1: 	imsettings-kde.sh
 Patch0:		imsettings-constraint-of-language.patch
 Patch1:		imsettings-disable-xim.patch
 Patch2:		imsettings-xinput-xcompose.patch
+Patch4:		imsettings-fix-build.patch
 
 Summary:	Delivery framework for general Input Method configuration
 Group:		Applications/System
@@ -103,6 +104,7 @@ This package contains a helper program to get this working on LXDE.
 %patch0 -p1 -b .0-lang
 %patch1 -p1 -b .1-xim
 %patch2 -p1 -b .2-xcompose
+%patch4 -p1 -b .4-dbus-build
 
 %build
 %configure	\
@@ -239,8 +241,14 @@ fi
 
 
 %changelog
+* Thu Nov  4 2010 Akira TAGOH <tagoh at redhat.com> - 0.108.1-4
+- Fix the build fail in the LXDE backend.
+
+* Thu Aug 19 2010 Jens Petersen <petersen at redhat.com>
+- add also am_ET, el_GR, and ru_RU to X compose lang list (#623931)
+
 * Tue Aug 10 2010 Jens Petersen <petersen at redhat.com> - 0.108.1-2
-- only enable XIM for X locale compose for necessary locales
+- only enable XIM for X locale compose for necessary locales (#623931)
   (so far pt_BR and fi_FI):
 - drop imsettings-none.conf-gtk-xim-default.patch
 - add imsettings-xinput-xcompose.patch