- updated to 1.2.7

- removed obsolete xx-icon-symbol patch

diff --git a/ibus-anthy-xx-icon-symbol.patch b/ibus-anthy-xx-icon-symbol.patch
deleted file mode 100644 (file)
index 75d0558..0000000
--- a/ibus-anthy-xx-icon-symbol.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- ibus-anthy-1.2.4/configure.ac.orig 2011-06-21 18:25:58.000000000 +0900
-+++ ibus-anthy-1.2.4/configure.ac      2011-06-30 18:10:50.000000000 +0900
-@@ -122,6 +122,37 @@ AC_ARG_WITH(kasumi-icon,
-            [KASUMI_ICON_FILE="$datadir/pixmaps/kasumi.png"])
- AC_SUBST(KASUMI_ICON_FILE)
- 
-+dnl - check hotkeys for ibus-anthy which is used for ibus bridge mode.
-+dnl - Normally you don't need this so could be HOTKEYS="no"
-+AC_ARG_WITH(hotkeys,
-+           [AC_HELP_STRING([--with-hotkeys=HOTKEYS],
-+                   [Use hotkeys for ibus bridge mode. (available value: yes/no/keys)])],
-+           [HOTKEYS="$withval"],
-+           [HOTKEYS="no"])
-+if test x"$HOTKEYS" = x"no"; then
-+    HOTKEYS="<!-- <hotkeys>Control+space,Zenkaku_Hankaku</hotkeys> -->"
-+elif test x"$HOTKEYS" = x"yes"; then
-+    HOTKEYS="<hotkeys>Control+space,Zenkaku_Hankaku</hotkeys>"
-+elif test x"$HOTKEYS" = x; then
-+    HOTKEYS="<hotkeys>Control+space,Zenkaku_Hankaku</hotkeys>"
-+else
-+    HOTKEYS="<hotkeys>${HOTKEYS}</hotkeys>"
-+fi
-+AC_SUBST(HOTKEYS)
-+
-+SYMBOL_TEST="import ibus
-+engine = ibus.EngineDesc('test')
-+exit(not hasattr(engine, 'symbol'))
-+"
-+$PYTHON -c "$SYMBOL_TEST"
-+if test $? -eq 0; then
-+    SYMBOL="<symbol>\xe3\x81\x82</symbol>"
-+else
-+    SYMBOL="<!-- <symbol>\xe3\x81\x82</symbol> -->"
-+fi
-+SYMBOL=`printf "$SYMBOL"`
-+AC_SUBST(SYMBOL)
-+
- dnl - define GETTEXT_* variables
- GETTEXT_PACKAGE=ibus-anthy
- AC_SUBST(GETTEXT_PACKAGE)
-@@ -146,3 +177,15 @@ m4/Makefile
- ])
- 
- AC_OUTPUT
-+echo "
-+                IBus-Anthy version ibus_version
-+
-+python-config:           $PYTHON_CONFIG
-+PYTHON_CFLAGS            $PYTHON_CFLAGS
-+PYTHON_LIBS              $PYTHON_LIBS
-+ANTHY_ZIPCODE_FILE       $ANTHY_ZIPCODE_FILE
-+KASUMI_EXEC_FILE         $KASUMI_EXEC_FILE
-+KASUMI_ICON_FILE         $KASUMI_ICON_FILE
-+HOTKEYS                  $HOTKEYS
-+SYMBOL                   $SYMBOL
-+"
---- ibus-anthy-1.2.4/engine/anthy.xml.in.in.orig       2011-06-21 18:24:39.000000000 +0900
-+++ ibus-anthy-1.2.4/engine/anthy.xml.in.in    2011-06-30 17:37:45.000000000 +0900
-@@ -22,6 +22,8 @@
-                       <longname>Anthy</longname>
-                       <description>Anthy Input Method</description>
-                       <rank>99</rank>
-+                      @HOTKEYS@
-+                      @SYMBOL@
-               </engine>
-       </engines>
- </component>

diff --git a/ibus-anthy.spec b/ibus-anthy.spec
index f40bdf3666bc844bf16a58ca8ee08754404f82d7..1556be1746a844a4fbf4f897196c601219f05bf5 100644 (file)
--- a/ibus-anthy.spec
+++ b/ibus-anthy.spec
@@ -3,26 +3,31 @@
 %bcond_with    bridge_hotkey           # enable the engine hotkeys
 #
 Summary:       The Anthy engine for IBus input platform
+Summary(pl.UTF-8):     Silnik Anthy dla platformy wprowadzania znaków IBus
 Name:          ibus-anthy
-Version:       1.2.6
+Version:       1.2.7
 Release:       1
 License:       GPL v2+
 Group:         Libraries
+#Source0Download: http://code.google.com/p/ibus/downloads/list
 Source0:       http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
-# Source0-md5: 894c7311f4d5c96b1fdb8b3795446ead
-Patch1:                %{name}-xx-icon-symbol.patch
+# Source0-md5: 091a13ff950171981768463993ffb683
 URL:           http://code.google.com/p/ibus/
 BuildRequires: anthy-devel
-BuildRequires: gettext-devel
-BuildRequires:  ibus
-BuildRequires: intltool
-BuildRequires: libtool
+BuildRequires: autoconf >= 2.50
+BuildRequires: gettext-devel >= 0.16.1
+BuildRequires:  ibus-devel >= 1.4.0
+BuildRequires: intltool >= 0.35.0
+BuildRequires: libstdc++-devel
 BuildRequires: pkgconfig
-BuildRequires: python-devel
+BuildRequires: python-devel >= 1:2.5
+BuildRequires: rpmbuild(macros) >= 1.219
+BuildRequires: sed >= 4.0
 BuildRequires: swig-python
 Requires:      anthy
-Requires:      ibus >= 1.3.0
+Requires:      ibus >= 1.4.0
 Requires:      kasumi
+Requires:      python-ibus >= 1.4.0
 Requires:      python-pygtk-gtk >= 2.15.2
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -32,9 +37,16 @@ BuildRoot:   %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 The Anthy engine for IBus platform. It provides Japanese input method
 from libanthy.
 
+%description -l pl.UTF-8
+Silnik Anthy dla platformy IBus. Udostępnia metodę wprowadzania znaków
+japońskich poprzez libanthy.
+
 %prep
 %setup -q
-%patch1 -p1
+
+# ibus 1.4.x has symbol attr in EngineDesc; hardcode it so python-ibus
+# is not BRed here
+%{__sed} -i -e 's,\$SYMBOL_TEST,exit(0),' configure.ac
 
 %build
 %{__autoconf}
@@ -50,6 +62,10 @@ rm -rf $RPM_BUILD_ROOT
 
 %{__rm} $RPM_BUILD_ROOT%{py_sitedir}/*.la
 
+%py_comp $RPM_BUILD_ROOT%{py_sitedir}
+%py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
+%py_postclean
+
 %find_lang %{name}
 
 %clean
@@ -57,9 +73,10 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS README
-%{py_sitedir}/anthy.py*
+%doc AUTHORS ChangeLog README
+%{py_sitedir}/anthy.py[co]
 %attr(755,root,root) %{py_sitedir}/_anthy.so
-%attr(755,root,root) %{_libexecdir}/ibus-*-anthy
+%attr(755,root,root) %{_libexecdir}/ibus-engine-anthy
+%attr(755,root,root) %{_libexecdir}/ibus-setup-anthy
 %{_datadir}/ibus-anthy
-%{_datadir}/ibus/component/*
+%{_datadir}/ibus/component/anthy.xml