- updated to 1.2.8

- updated constraint-of-language,no-bash patches

Changed files:
    imsettings-constraint-of-language.patch -> 1.2
    imsettings-no-bash.patch -> 1.3
    imsettings.spec -> 1.8

diff --git a/imsettings-constraint-of-language.patch b/imsettings-constraint-of-language.patch
index 74709e28258411a60a86a626187d5fff0dccc896..f14a35ff9a20fdbb3989255f73892f9d3cebeaa9 100644 (file)
--- a/imsettings-constraint-of-language.patch
+++ b/imsettings-constraint-of-language.patch
@@ -1,11 +1,11 @@
-diff -pruN imsettings-0.106.0.1.orig/data/xinput.sh.in.in imsettings-0.106.0.1/data/xinput.sh.in.in
---- imsettings-0.106.0.1.orig/data/xinput.sh.in.in     2009-03-04 12:18:10.000000000 +0900
-+++ imsettings-0.106.0.1/data/xinput.sh.in.in  2009-03-04 17:44:14.000000000 +0900
-@@ -158,7 +158,33 @@ if [ -r "$USER_XINPUTRC" -a "x$IMSETTING
+--- imsettings-1.2.8/data/xinput.sh.in.in.orig 2012-02-10 03:25:18.000000000 +0100
++++ imsettings-1.2.8/data/xinput.sh.in.in      2012-02-17 21:14:57.666422719 +0100
+@@ -266,8 +266,34 @@
        SHORT_DESC="User Specific"
      fi
  elif [ -r "$SYS_XINPUTRC" ]; then
 -    source "$SYS_XINPUTRC"
+-    READ_XINPUTRC=$SYS_XINPUTRC
 +    # FIXME: This hardcoded list has to be gone in the future.
 +    # Locales that normally use input-method for native input
 +    _im_language_list="as bn gu hi ja kn ko mai ml mr ne or pa si ta te th ur vi zh"
@@ -13,6 +13,7 @@ diff -pruN imsettings-0.106.0.1.orig/data/xinput.sh.in.in imsettings-0.106.0.1/d
 +    for i in $_im_language_list; do
 +        if echo $tmplang | grep -q -E "^$i"; then
 +            source "$SYS_XINPUTRC"
++            READ_XINPUTRC=$SYS_XINPUTRC
 +            _sourced_xinputrc=1
 +            break
 +        fi

diff --git a/imsettings-no-bash.patch b/imsettings-no-bash.patch
index 8affc9e8dcf451f055cb941f62960f1781d0ef50..3dd8db7101072bff5f6cec8b2f7bbd0fd99796ae 100644 (file)
--- a/imsettings-no-bash.patch
+++ b/imsettings-no-bash.patch
@@ -1,5 +1,5 @@
---- imsettings-1.2.7/data/xinput.sh.in.in.orig 2012-01-20 19:30:14.868541977 +0100
-+++ imsettings-1.2.7/data/xinput.sh.in.in      2012-01-20 19:46:38.011908229 +0100
+--- imsettings-1.2.8/data/xinput.sh.in.in.orig 2012-02-17 21:15:19.743090124 +0100
++++ imsettings-1.2.8/data/xinput.sh.in.in      2012-02-18 07:28:16.724321553 +0100
 @@ -1,4 +1,4 @@
 -#!/bin/bash
 +#!/bin/sh
@@ -146,8 +146,8 @@
 +print_info() {
      log "imsettings information"
      log "=========================="
-     log -n "Is DBus enabled: "
-@@ -237,13 +237,13 @@
+     log "XINPUTRC: $READ_XINPUTRC"
+@@ -242,13 +242,13 @@
  unset TERM
  if [ -r /etc/profile.d/lang.sh ]; then
      # for Fedora etc
@@ -164,25 +164,25 @@
  fi
  [ -n "$oldterm" ] && export TERM=$oldterm
  
-@@ -255,7 +255,7 @@
+@@ -260,7 +260,7 @@
  [ -z "$IMSETTINGS_DISABLE_USER_XINPUTRC" ] && IMSETTINGS_DISABLE_USER_XINPUTRC=no
  
  if [ -r "$USER_XINPUTRC" -a "x$IMSETTINGS_DISABLE_USER_XINPUTRC" = "xno" ]; then
 -    source "$USER_XINPUTRC"
 +    . "$USER_XINPUTRC"
+     READ_XINPUTRC=$USER_XINPUTRC
      if [ ! -h "$USER_XINPUTRC" ]; then
        SHORT_DESC="User Specific"
-     fi
-@@ -266,7 +266,7 @@
+@@ -272,7 +272,7 @@
      _sourced_xinputrc=0
      for i in $_im_language_list; do
          if echo $tmplang | grep -q -E "^$i"; then
 -            source "$SYS_XINPUTRC"
 +            . "$SYS_XINPUTRC"
+             READ_XINPUTRC=$SYS_XINPUTRC
              _sourced_xinputrc=1
              break
-         fi
-@@ -277,7 +277,7 @@
+@@ -284,7 +284,7 @@
          _xcompose_language_list="am_ET el_GR fi_FI pt_BR ru_RU"
          for i in $_xcompose_language_list; do
              if echo $tmplang | grep -q -E "^$i"; then
@@ -191,7 +191,7 @@
                  _sourced_xinputrc=1
                  break
              fi
-@@ -285,7 +285,7 @@
+@@ -292,7 +292,7 @@
      fi
      if [ $_sourced_xinputrc -eq 0 ]; then
          # Read none.conf to set up properly for locales not listed the above.

diff --git a/imsettings.spec b/imsettings.spec
index 8058c50934884af0dc917e5af578191f095f1b3e..61f7f778b441d6a872074e4523f9ff80679d7f1c 100644 (file)
--- a/imsettings.spec
+++ b/imsettings.spec
@@ -5,13 +5,13 @@
 Summary:       Delivery framework for general Input Method configuration
 Summary(pl.UTF-8):     Szkielet do ogólnej konfiguracji method wprowadzania znaków
 Name:          imsettings
-Version:       1.2.7.1
+Version:       1.2.8
 Release:       1
 License:       LGPL v2+
 Group:         Applications/System
 #Source0Download: http://code.google.com/p/imsettings/downloads/list
 Source0:       http://imsettings.googlecode.com/files/%{name}-%{version}.tar.bz2
-# Source0-md5: 8d6c4cd54b0eedbd7bc7f0343d9e9e68
+# Source0-md5: 3450a647f5742fd9f60fc1487c72a3f2
 Patch0:                %{name}-constraint-of-language.patch
 Patch1:                %{name}-no-bash.patch
 URL:           http://code.google.com/p/imsettings/
@@ -22,6 +22,8 @@ BuildRequires:        gettext-devel
 BuildRequires: glib2-devel >= 1:2.26.0
 BuildRequires: gobject-introspection-devel >= 1.30.0
 BuildRequires: gtk+2-devel >= 2:2.12.0
+# "fallback support in GTK+"
+#BuildRequires:        gtk+3-devel >= 3.3.3
 BuildRequires: gtk-doc >= 1.0
 BuildRequires: libgxim-devel >= 0.3.1
 BuildRequires: libnotify-devel >= 0.7.0