[imsettings/f17] Fix an error on autoreconf

Akira TAGOH tagoh at fedoraproject.org
Wed Oct 17 12:01:22 UTC 2012


commit e0b2a0482582bb3b10701df8eb6cee8f294044ea
Author: Akira TAGOH <tagoh at redhat.com>
Date:   Wed Oct 17 21:00:49 2012 +0900

    Fix an error on autoreconf

 imsettings-cleanup.patch |   32 ++++++++++++++++++++++++++++++++
 imsettings.spec          |    2 ++
 2 files changed, 34 insertions(+), 0 deletions(-)
---
diff --git a/imsettings-cleanup.patch b/imsettings-cleanup.patch
new file mode 100644
index 0000000..1b7eb5f
--- /dev/null
+++ b/imsettings-cleanup.patch
@@ -0,0 +1,32 @@
+From 8312c88c9ea9068cf5fd9d32f4c158fdf3dd416d Mon Sep 17 00:00:00 2001
+From: Akira TAGOH <akira at tagoh.org>
+Date: Wed, 17 Oct 2012 20:58:51 +0900
+Subject: [PATCH] Clean up the unnecessary checking
+
+---
+ configure.ac | 9 ---------
+ 1 file changed, 9 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index ead1c48..64f04bd 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -173,15 +173,6 @@ AM_PATH_GLIB_2_0($GLIB_REQUIRED, :,
+ *** GLIB $GLIB_REQUIRED_VERSION or better is required. The latest version of
+ *** GLIB is always available from ftp://ftp.gtk.org/.]),
+     glib)
+-if test "x$use_gconf" = "xyes"; then
+-   	AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
+-	if test x"$GCONFTOOL" = "xno"; then
+-		AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf])
+-	fi
+-	AM_GCONF_SOURCE_2
+-else
+-	AM_CONDITIONAL(GCONF_SCHEMAS_INSTALL, 0)
+-fi
+ 
+ GOBJECT_INTROSPECTION_CHECK([1.30.0])
+ 
+-- 
+1.7.11.7
+
diff --git a/imsettings.spec b/imsettings.spec
index 18ff467..e213a13 100644
--- a/imsettings.spec
+++ b/imsettings.spec
@@ -19,6 +19,7 @@ Patch0:		imsettings-constraint-of-language.patch
 Patch1:		imsettings-disable-xim.patch
 Patch2:		imsettings-xinput-xcompose.patch
 Patch3:		imsettings-mate.patch
+Patch4:		imsettings-cleanup.patch
 
 Summary:	Delivery framework for general Input Method configuration
 Group:		Applications/System
@@ -168,6 +169,7 @@ This package contains a module to get this working on MATE.
 %patch1 -p1 -b .1-xim
 %patch2 -p1 -b .2-xcompose
 %patch3 -p1 -b .3-mate
+%patch4 -p1 -b .4-cleanup
 autoreconf
 
 %build


More information about the scm-commits mailing list