[rpms/ibus] autotool: Fixed typo

[rpms/ibus] autotool: Fixed typo

[Takao Fujiwara]

A new commit has been pushed.

Repo   : rpms/ibus
Branch : autotool
Commit : fbc58ff5a33cff0a98f334a9280907c0471026a3
Author : Takao Fujiwara <tfujiwar@redhat.com>
Date   : 2012-12-04T15:44:22+09:00
Stats  : +17/-5 in 1 file(s)
URL    : https://src.fedoraproject.org/rpms/ibus/c/fbc58ff5a33cff0a98f334a9280907c0471026a3?branch=autotool

Log:
Fixed typo

---
diff --git a/ibus.spec b/ibus.spec
index f27c0fb..01fd1e8 100644
--- a/ibus.spec
+++ b/ibus.spec
@@ -287,11 +287,6 @@ make -C ui/gtk3 maintainer-clean-generic
 # make -C po update-gmo
 make %{?_smp_mflags}
 
-# home [dot] corp [dot] redhat [dot] com/wiki/rpmdiff-multilib
-if test -f ibus/_config.py -a -f ibus/_config.py.in ; then
-  touch -r ibus/_config.py.in ibus/_config.py
-fi
-
 %if %with_gjs
 d=`basename %SOURCE2 .tar.gz`
 cd $d
@@ -332,6 +327,23 @@ desktop-file-install --delete-original          \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   $RPM_BUILD_ROOT%{_datadir}/applications/*
 
+# home [dot] corp [dot] redhat [dot] com/wiki/rpmdiff-multilib
+if test -f ibus/_config.py.in -a -f ibus/_config.py ; then
+  touch -r ibus/_config.py.in ibus/_config.py
+  if test -f $RPM_BUILD_ROOT%{python2_sitelib}/ibus/_config.py ; then
+    touch -r ibus/_config.py.in \
+        $RPM_BUILD_ROOT%{python2_sitelib}/ibus/_config.py
+  fi
+  if test -f $RPM_BUILD_ROOT%{python2_sitelib}/ibus/_config.pyc ; then
+    touch -r ibus/_config.py.in \
+        $RPM_BUILD_ROOT%{python2_sitelib}/ibus/_config.pyc
+  fi
+  if test -f $RPM_BUILD_ROOT%{python2_sitelib}/ibus/_config.pyo ; then
+    touch -r ibus/_config.py.in \
+        $RPM_BUILD_ROOT%{python2_sitelib}/ibus/_config.pyo
+  fi
+fi
+
 %if %with_gjs
 # https://bugzilla.redhat.com/show_bug.cgi?id=657165
 d=`basename %SOURCE2 .tar.gz`

[rpms/ibus] autotool: Fixed typo

[Takao Fujiwara]

A new commit has been pushed.

Repo   : rpms/ibus
Branch : autotool
Commit : edf06a41988cbf95da434d60bb8cf0cae40a9cc1
Author : Takao Fujiwara <tfujiwar@redhat.com>
Date   : 2013-04-19T15:44:34+09:00
Stats  : +1/-1 in 1 file(s)
URL    : https://src.fedoraproject.org/rpms/ibus/c/edf06a41988cbf95da434d60bb8cf0cae40a9cc1?branch=autotool

Log:
Fixed typo

---
diff --git a/ibus.spec b/ibus.spec
index 36bcdc7..be31d2c 100644
--- a/ibus.spec
+++ b/ibus.spec
@@ -45,10 +45,10 @@ Source1:    %{name}-xinput
 %if %with_gjs
 # ibus-gjs
 Source2:    http://fujiwara.fedorapeople.org/ibus/gnome-shell/%{name}-gjs-%{ibus_gjs_version}.tar.gz
+%endif
 Source3:    https://raw.github.com/ibus/ibus/master/debian/ibus.1
 Source4:    https://raw.github.com/ibus/ibus/master/debian/ibus-daemon.1
 Source5:    https://raw.github.com/ibus/ibus/master/debian/ibus-setup.1
-%endif
 # Upstreamed patches.
 Patch0:     %{name}-HEAD.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=810211

[rpms/ibus] autotool: Fixed typo.

[Takao Fujiwara]

A new commit has been pushed.

Repo   : rpms/ibus
Branch : autotool
Commit : 1a783f2135b9bd0731393458448f07b3eb9f29fb
Author : Takao Fujiwara <tfujiwar@redhat.com>
Date   : 2012-11-19T14:16:50+09:00
Stats  : +5/-5 in 1 file(s)
URL    : https://src.fedoraproject.org/rpms/ibus/c/1a783f2135b9bd0731393458448f07b3eb9f29fb?branch=autotool

Log:
Fixed typo.

---
diff --git a/ibus.spec b/ibus.spec
index f6e28ca..dfe28a0 100644
--- a/ibus.spec
+++ b/ibus.spec
@@ -42,7 +42,7 @@ Patch2:     ibus-541492-xkb.patch
 Patch3:     ibus-530711-preload-sys.patch
 Patch4:     ibus-xx-setup-frequent-lang.patch
 
-%if 0%{?fedora} <= 17
+%if (0%{?fedora} <= 17 && 0%{?rhel} < 7)
 # Workaround to disable preedit on gnome-shell until bug 658420 is fixed.
 # https://bugzilla.gnome.org/show_bug.cgi?id=658420
 Patch92:    ibus-xx-g-s-disable-preedit.patch
@@ -101,7 +101,7 @@ Requires:   pyxdg
 Requires:   iso-codes
 Requires:   dbus-python >= %{dbus_python_version}
 Requires:   dbus-x11
-%if 0%{?fedora} <= 17
+%if (0%{?fedora} <= 17 && 0%{?rhel} < 7)
 Requires:   im-chooser
 %endif
 %if %with_dconf
@@ -113,7 +113,7 @@ Requires:   notify-python
 Requires:   libgnomekbd
 Requires:   librsvg2
 Requires:   gnome-icon-theme-legacy >= %{gnome_icon_theme_legacy_version}
-%if 0%{?fedora} <= 17
+%if (0%{?fedora} <= 17 && 0%{?rhel} < 7)
 Requires:   gnome-icon-theme-symbolic
 %endif
 
@@ -164,7 +164,7 @@ Summary:    IBus im module for gtk3
 Group:      System Environment/Libraries
 Requires:   %{name} = %{version}-%{release}
 Requires:   %{name}-libs = %{version}-%{release}
-%if 0%{?fedora} <= 17
+%if (0%{?fedora} <= 17 && 0%{?rhel} < 7)
 Requires:   imsettings-gnome
 %endif
 Requires(post): glib2 >= %{glib_ver}
@@ -215,7 +215,7 @@ zcat %SOURCE2 | tar xf -
 
 # patch0 -p1
 %patch0 -p1
-%if 0%{?fedora} <= 17
+%if (0%{?fedora} <= 17 && 0%{?rhel} < 7)
 %patch92 -p1 -b .g-s-preedit
 cp client/gtk2/ibusimcontext.c client/gtk3/ibusimcontext.c ||
 %endif

[rpms/ibus] autotool: Fixed typo.

[Takao Fujiwara]

A new commit has been pushed.

Repo   : rpms/ibus
Branch : autotool
Commit : 5a5669903a24fefe2cdab88c530c35486f02a282
Author : Takao Fujiwara <tfujiwar@redhat.com>
Date   : 2011-09-28T19:38:23+09:00
Stats  : +4/-4 in 1 file(s)
URL    : https://src.fedoraproject.org/rpms/ibus/c/5a5669903a24fefe2cdab88c530c35486f02a282?branch=autotool

Log:
Fixed typo.

---
diff --git a/ibus.spec b/ibus.spec
index 068875c..0cc2297 100644
--- a/ibus.spec
+++ b/ibus.spec
@@ -7,11 +7,11 @@
 
 %if 0%{?fedora} > 15
 %define have_bridge_hotkey 1
-%define ibus_gjs_version 3.1.91.20110913
+%define ibus_gjs_version 3.2.0.20110928
 %define ibus_gjs_build_failure 1
 %else
 %define have_bridge_hotkey 0
-%define ibus_gjs_version 3.0.2.20110908
+%define ibus_gjs_version 3.0.2.20110928
 %define ibus_gjs_build_failure 0
 %endif
 
@@ -24,7 +24,7 @@
 
 Name:       ibus
 Version:    1.4.0
-Release:    1%{?dist}
+Release:    2%{?dist}
 Summary:    Intelligent Input Bus for Linux OS
 License:    LGPLv2+
 Group:      System Environment/Libraries
@@ -386,7 +386,7 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
-* Wed Sep 28 2011 Takao Fujiwara <tfujiwar@redhat.com> - 1.4.0-1
+* Wed Sep 28 2011 Takao Fujiwara <tfujiwar@redhat.com> - 1.4.0-2
 - Updated to 1.4.0
 - Updated ibus-gjs 3.0.2.20110928 for f15.
 - Updated ibus-gjs 3.2.0.20110928 for f16. (#740588)

[rpms/ibus] autotool: Fixed typo.

[Takao Fujiwara]

A new commit has been pushed.

Repo   : rpms/ibus
Branch : autotool
Commit : 3bcb3ac4870d88b31027e8e1727f111a9421a3d0
Author : Takao Fujiwara <tfujiwar@redhat.com>
Date   : 2011-09-01T17:27:35+09:00
Stats  : +3/-3 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/ibus/c/3bcb3ac4870d88b31027e8e1727f111a9421a3d0?branch=autotool

Log:
Fixed typo.

---
diff --git a/ibus-gjs-xx-gnome-shell-3.1.4-build-failure.patch b/ibus-gjs-xx-gnome-shell-3.1.4-build-failure.patch
index 9858409..72c1f26 100644
--- a/ibus-gjs-xx-gnome-shell-3.1.4-build-failure.patch
+++ b/ibus-gjs-xx-gnome-shell-3.1.4-build-failure.patch
@@ -7,7 +7,7 @@
 -GNOME_SHELL_VERSION=`GET_JS_VERSION 'Config.PACKAGE_VERSION'`
 -GJS_VERSION=`GET_JS_VERSION 'Config.GJS_VERSION'`
 +GNOME_SHELL_VERSION=3.1.90
-+GJS_VERSION=1.29.16
++GJS_VERSION=1.29.17
  AC_SUBST(GNOME_SHELL_VERSION)
  AC_SUBST(GJS_VERSION)
  

diff --git a/ibus.spec b/ibus.spec
index 269e473..bd2f6e4 100644
--- a/ibus.spec
+++ b/ibus.spec
@@ -24,7 +24,7 @@
 
 Name:       ibus
 Version:    1.3.99.20110817
-Release:    2%{?dist}
+Release:    3%{?dist}
 Summary:    Intelligent Input Bus for Linux OS
 License:    LGPLv2+
 Group:      System Environment/Libraries
@@ -382,7 +382,7 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
-* Thu Sep 01 2011 Takao Fujiwara <tfujiwar@redhat.com> - 1.3.99.20110817-2
+* Thu Sep 01 2011 Takao Fujiwara <tfujiwar@redhat.com> - 1.3.99.20110817-3
 - Fixed Bug 700472 Use a symbol icon instead of an image icon.
 - Updated ibus-HEAD.patch for upstream.
 - Removed ibus-435880-surrounding-text.patch as upstream.

[rpms/ibus] autotool: Fixed typo

[Takao Fujiwara]

A new commit has been pushed.

Repo   : rpms/ibus
Branch : autotool
Commit : 9c45bb70e0d8ba2b65f5fa0816925a712090831f
Author : Takao Fujiwara <tfujiwar@redhat.com>
Date   : 2011-08-18T11:58:08+09:00
Stats  : +2/-2 in 1 file(s)
URL    : https://src.fedoraproject.org/rpms/ibus/c/9c45bb70e0d8ba2b65f5fa0816925a712090831f?branch=autotool

Log:
Fixed typo

---
diff --git a/ibus.spec b/ibus.spec
index 4006d2b..ce2257c 100644
--- a/ibus.spec
+++ b/ibus.spec
@@ -5,7 +5,7 @@
 %define have_libxkbfile 1
 %define have_gjsfile 1
 
-%if 0%{?fedora} > 16
+%if 0%{?fedora} > 15
 %define have_bridge_hotkey 1
 %else
 %define have_bridge_hotkey 0
@@ -20,7 +20,7 @@
 
 Name:       ibus
 Version:    1.3.99.20110419
-Release:    15%{?dist}
+Release:    16%{?dist}
 Summary:    Intelligent Input Bus for Linux OS
 License:    LGPLv2+
 Group:      System Environment/Libraries

[rpms/ibus] autotool: Fixed typo.

[Takao Fujiwara]

A new commit has been pushed.

Repo   : rpms/ibus
Branch : autotool
Commit : 07f5d8bf9b5b43fe0e13ae6ca3bec8a654195254
Author : Takao Fujiwara <tfujiwar@redhat.com>
Date   : 2011-08-18T11:57:00+09:00
Stats  : +3/-3 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/ibus/c/07f5d8bf9b5b43fe0e13ae6ca3bec8a654195254?branch=autotool

Log:
Fixed typo.

---
diff --git a/ibus.spec b/ibus.spec
index 4749d36..4006d2b 100644
--- a/ibus.spec
+++ b/ibus.spec
@@ -5,7 +5,7 @@
 %define have_libxkbfile 1
 %define have_gjsfile 1
 
-%if 0%{?fedora} > 15
+%if 0%{?fedora} > 16
 %define have_bridge_hotkey 1
 %else
 %define have_bridge_hotkey 0
@@ -369,7 +369,7 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
-* Thu Aug 18 2011 Takao Fujiwara <tfujiwar@redhat.com> - 1.3.99.20110419-15
+* Thu Aug 18 2011 Takao Fujiwara <tfujiwar@redhat.com> - 1.3.99.20110419-16
 - Updated ibus-HEAD.patch for upstream.
 - Removed ibus-435880-surrounding-text.patch as upstream.
 - Added ibus-711632-fedora-fallback-icon.patch

diff --git a/sources b/sources
index 928f549..37e6fc1 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 d4f2729fecb92ae6b41f26c770b1a772  ibus-1.3.99.20110419.tar.gz
 f55b2947b65ce16e2281608ccf58dbe1  ibus-gjs-1.3.99.20110818.tar.gz
-8af38ef34d99c232c73a83735afa86dd  ibus-gjs-1.3.99.20110814.tar.gz
+698c90edf0f037488e1aa969804e891f  ibus_master_da.po

[rpms/ibus] autotool: Fixed typo.

[Takao Fujiwara]

A new commit has been pushed.

Repo   : rpms/ibus
Branch : autotool
Commit : 6cab06de39b624d5dcee6f1ec44a016356e2f77b
Author : Takao Fujiwara <tfujiwar@redhat.com>
Date   : 2011-07-05T14:07:17+09:00
Stats  : +11/-10 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/ibus/c/6cab06de39b624d5dcee6f1ec44a016356e2f77b?branch=autotool

Log:
Fixed typo.

---
diff --git a/ibus-xx-bridge-hotkey.patch b/ibus-xx-bridge-hotkey.patch
index 1111735..7346ace 100644
--- a/ibus-xx-bridge-hotkey.patch
+++ b/ibus-xx-bridge-hotkey.patch
@@ -1,12 +1,12 @@
-From 0242d89ec9d4d3d92d335e50b8aa6c16ff950438 Mon Sep 17 00:00:00 2001
+From 2ae147c6d4b15b4aa40a915e86d04fb795d3024b Mon Sep 17 00:00:00 2001
 From: fujiwarat <takao.fujiwara1@gmail.com>
-Date: Tue, 5 Jul 2011 12:00:31 +0900
+Date: Tue, 5 Jul 2011 13:51:11 +0900
 Subject: [PATCH] Add a bridge hotkey which use prev-next engines instead
  of on-off.
 
 ---
  bus/Makefile.am            |   20 ++-
- bus/ibusimpl.c             |  356 ++++++++++++++++++++++++++++++++++++--------
+ bus/ibusimpl.c             |  357 ++++++++++++++++++++++++++++++++++++--------
  bus/registry.c             |   35 +++++
  configure.ac               |   31 ++++
  data/Makefile.am           |    6 +-
@@ -25,12 +25,12 @@ Subject: [PATCH] Add a bridge hotkey which use prev-next engines instead
  xkb/Makefile.am            |    2 +
  xkb/ibus-engine-xkb-main.c |    8 +
  xkb/xkbxml.c               |    8 +-
- 20 files changed, 938 insertions(+), 388 deletions(-)
+ 20 files changed, 939 insertions(+), 388 deletions(-)
  delete mode 100644 data/ibus.schemas.in
  create mode 100644 data/ibus.schemas.in.in
 
 diff --git a/bus/Makefile.am b/bus/Makefile.am
-index 074b456..0efaa1b 100644
+index b356b2c..f9417ad 100644
 --- a/bus/Makefile.am
 +++ b/bus/Makefile.am
 @@ -29,15 +29,17 @@ INCLUDES =                \
@@ -412,7 +412,7 @@ index b356b2c..ffea37a 100644
          /* Find out what engine we should switch to. If the current engine has
           * the same hotkey, then we should switch to the next engine with the
           * same hotkey in the list. Otherwise, we just switch to the first
-@@ -2364,8 +2597,31 @@ bus_ibus_impl_filter_keyboard_shortcuts 
+@@ -2364,8 +2597,32 @@ bus_ibus_impl_filter_keyboard_shortcuts 
                  break;
              }
          }
@@ -428,7 +428,8 @@ index b356b2c..ffea37a 100644
 +             * the current engine is the defualt bridge engine,
 +             * the current engine is also not included in engine_list.
 +             * So the engine is added here. */
-+            if (g_list_find (engine_list, current_engine_desc) == NULL &&
++            if (current_engine_desc != NULL &&
++                g_list_find (engine_list, current_engine_desc) == NULL &&
 +                g_strcmp0 (ibus_engine_desc_get_name (current_engine_desc),
 +                           DEFAULT_BRIDGE_ENGINE_NAME) == 0) {
 +                engine_list = g_list_append (engine_list, current_engine_desc);
@@ -444,7 +445,7 @@ index b356b2c..ffea37a 100644
              bus_ibus_impl_set_context_engine_from_desc (ibus, context, new_engine_desc);
          }
  
-@@ -2470,59 +2726,39 @@ static void
+@@ -2470,59 +2727,39 @@ static void
  _add_engine_hotkey (IBusEngineDesc *engine, BusIBusImpl *ibus)
  {
      const gchar *hotkeys;

diff --git a/ibus.spec b/ibus.spec
index 7a9162c..4e1bab4 100644
--- a/ibus.spec
+++ b/ibus.spec
@@ -13,7 +13,7 @@
 
 Name:       ibus
 Version:    1.3.99.20110419
-Release:    8%{?dist}
+Release:    9%{?dist}
 Summary:    Intelligent Input Bus for Linux OS
 License:    LGPLv2+
 Group:      System Environment/Libraries
@@ -354,7 +354,7 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
-* Mon Jun 20 2011 Takao Fujiwara <tfujiwar@redhat.com> - 1.3.99.20110419-8
+* Mon Jun 20 2011 Takao Fujiwara <tfujiwar@redhat.com> - 1.3.99.20110419-9
 - Updated ibus-HEAD.patch for upstream.
 - Removed ibus-435880-surrounding-text.patch as upstream.
 - Added ibus-711632-fedora-fallback-icon.patch