From bd56240e66aabe0fe6a02e0d50c1ac942a5f3b67 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Feb 23 2015 10:07:15 +0000 Subject: Fix the fail on configure. --- diff --git a/imsettings-fix-configure.patch b/imsettings-fix-configure.patch new file mode 100644 index 0000000..1362d79 --- /dev/null +++ b/imsettings-fix-configure.patch @@ -0,0 +1,30 @@ +diff -pruN imsettings-1.6.8.orig/configure.ac imsettings-1.6.8/configure.ac +--- imsettings-1.6.8.orig/configure.ac 2015-01-15 17:04:54.000000000 +0900 ++++ imsettings-1.6.8/configure.ac 2015-02-23 19:03:45.178127747 +0900 +@@ -14,7 +14,7 @@ AM_MAINTAINER_MODE + AC_CONFIG_HEADERS([config.h]) + AC_CONFIG_MACRO_DIR([m4macros]) + +-AX_CHECK_ENABLE_DEBUG ++dnl AX_CHECK_ENABLE_DEBUG + + LT_PREREQ([2.2]) + LT_INIT([disable-static]) +@@ -174,14 +174,14 @@ AM_CONDITIONAL(ENABLE_XIM, test x$use_xi + dnl ====================================================================== + dnl check another libraries + dnl ====================================================================== +-im_saved_CFLAGS="$CFLAGS" +-CFLAGS=$(echo $CFLAGS | sed -e 's/\-Werror.*//g') ++dnl im_saved_CFLAGS="$CFLAGS" ++dnl CFLAGS=$(echo $CFLAGS | sed -e 's/\-Werror.*//g') + AM_PATH_GLIB_2_0($GLIB_REQUIRED, :, + AC_MSG_ERROR([ + *** GLIB $GLIB_REQUIRED or better is required. The latest version of + *** GLIB is always available from ftp://ftp.gtk.org/.]), + glib) +-CFLAGS="$im_saved_CFLAGS" ++dnl CFLAGS="$im_saved_CFLAGS" + + GOBJECT_INTROSPECTION_CHECK([1.30.0]) + diff --git a/imsettings.spec b/imsettings.spec index 15bed23..8c55857 100644 --- a/imsettings.spec +++ b/imsettings.spec @@ -21,6 +21,7 @@ Patch1: %{name}-disable-xim.patch Patch2: %{name}-xinput-xcompose.patch ## Fedora specific: Force enable the IM management on imsettings for Cinnamon Patch3: %{name}-force-enable-for-cinnamon.patch +Patch4: %{name}-fix-configure.patch Summary: Delivery framework for general Input Method configuration Group: Applications/System @@ -195,6 +196,7 @@ This package contains a module to get this working on Cinnamon. %patch1 -p1 -b .1-xim %patch2 -p1 -b .2-xcompose %patch3 -p1 -b .3-force-cinnamon +%patch4 -p1 -b .4-fix-configure %build autoreconf -f @@ -314,7 +316,7 @@ fi %changelog * Mon Feb 23 2015 Akira TAGOH - 1.6.8-5 -- Force-upate autotools' files to address the build issue. +- Fix the fail on configure. * Sat Feb 21 2015 Till Maas - 1.6.8-4 - Rebuilt for Fedora 23 Change