diff --git a/.gitignore b/.gitignore index 996ea65..253ebda 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ ibus-anthy.png /ibus-anthy-1.2.4.tar.gz /ibus-anthy-1.2.5.tar.gz /ibus-anthy-1.2.6.tar.gz +/ibus-anthy-1.3.99.20120304.tar.gz diff --git a/ibus-anthy.spec b/ibus-anthy.spec index daef1bf..8964649 100644 --- a/ibus-anthy.spec +++ b/ibus-anthy.spec @@ -1,61 +1,56 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} -# %define require_ibus_version 1.2.0.20100111 -%define require_pygtk2_version 2.15.2 - -%if 0%{?fedora} > 16 -%define have_default_layout 1 %define require_ibus_version 1.4.99.20120203 -%else -%define have_default_layout 0 -%define require_ibus_version 1.2.0.20100111 -%endif -%if 0%{?fedora} > 15 + +%define sub_version 1.0 +%define have_default_layout 1 %define have_bridge_hotkey 1 -%else -%define have_bridge_hotkey 0 -%endif Name: ibus-anthy -Version: 1.2.6 -Release: 5%{?dist} +Version: 1.3.99.20120304 +Release: 1%{?dist} Summary: The Anthy engine for IBus input platform License: GPLv2+ Group: System Environment/Libraries URL: http://code.google.com/p/ibus/ Source0: http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz # Patch0: ibus-anthy-HEAD.patch -Patch1: ibus-anthy-xx-icon-symbol.patch -Patch2: ibus-anthy-xx-layout.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: anthy-devel BuildRequires: gettext-devel +BuildRequires: glib2-devel BuildRequires: ibus BuildRequires: intltool BuildRequires: libtool BuildRequires: pkgconfig -BuildRequires: python2-devel -BuildRequires: swig +BuildRequires: gobject-introspection-devel Requires: ibus >= %{require_ibus_version} Requires: anthy -Requires: pygtk2 >= %{require_pygtk2_version} Requires: kasumi +Requires: pygobject3 %description The Anthy engine for IBus platform. It provides Japanese input method from libanthy. +%package devel +Summary: Development tools for ibus +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: glib2-devel +Requires: anthy-devel + +%description devel +The ibus-anthy-devel package contains .so file and .gir files +for developers. + %prep %setup -q # %patch0 -p1 -%patch1 -p1 -b .icon-symbol -%patch2 -p1 -b .layout %build -# for .icon-symbol patch -autoreconf %configure \ %if %have_default_layout --with-layout='default' \ @@ -70,7 +65,7 @@ make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make DESTDIR=${RPM_BUILD_ROOT} install -rm -f $RPM_BUILD_ROOT%{python_sitearch}/_anthy.la +rm -f $RPM_BUILD_ROOT%{_libdir}/libanthygobject-%{sub_version}.la %find_lang %{name} @@ -81,13 +76,21 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc AUTHORS COPYING README # %dir %{python_sitearch}/ibus -%{python_sitearch}/anthy.py* -%{python_sitearch}/_anthy.so +%{_libdir}/libanthygobject-%{sub_version}.so.* +%{_libdir}/girepository-1.0/Anthy*.typelib %{_libexecdir}/ibus-*-anthy %{_datadir}/ibus-anthy %{_datadir}/ibus/component/* +%files devel +%{_datadir}/gir-1.0/Anthy*.gir +%{_includedir}/ibus-anthy-%{sub_version} +%{_libdir}/libanthygobject-%{sub_version}.so + %changelog +* Sun Mar 04 2012 Takao Fujiwara - 1.3.99.20120304-1 +- Bumped to 1.3.99.20120304 + * Mon Feb 06 2012 Takao Fujiwara - 1.2.6-5 - Added ibus-anthy-xx-layout.patch to set 'default' layout in f17. diff --git a/sources b/sources index 7e12f75..78a4e7b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -894c7311f4d5c96b1fdb8b3795446ead ibus-anthy-1.2.6.tar.gz +128766b4800c7b78771e2cf3cbf5fdb9 ibus-anthy-1.3.99.20120304.tar.gz