diff --git a/.cvsignore b/.cvsignore index eb316f7..70c2ee3 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -ibus-chewing-1.0.2.20090302-Source.tar.gz +ibus-chewing-0.1.1.20090129.tar.gz diff --git a/ibus-chewing.spec b/ibus-chewing.spec index ef2fa10..8be8a24 100644 --- a/ibus-chewing.spec +++ b/ibus-chewing.spec @@ -1,110 +1,65 @@ +#%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +%define mod_path ibus-0.1 Name: ibus-chewing -Version: 1.0.2.20090302 +Version: 0.1.1.20090129 Release: 1%{?dist} Summary: The Chewing 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}-Source.tar.gz +Source0: http://cloud.github.com/downloads/definite/%{name}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gettext-devel -BuildRequires: gtk2-devel -BuildRequires: ibus-devel >= 1.1 -BuildRequires: cmake -BuildRequires: gob2 +BuildRequires: libtool +BuildRequires: python-devel BuildRequires: libchewing-devel >= 0.3.2-4 +# BuildRequires: swig BuildRequires: pkgconfig -BuildRequires: GConf2-devel -Requires: ibus >= 1.1 +# BuildArchitectures: noarch +Requires: ibus Requires: libchewing >= 0.3.2-4 -Requires: GConf2 -Requires(pre): GConf2 -Requires(post): GConf2 -Requires(preun): GConf2 %description The Chewing engine for IBus platform. It provides Chinese input method from libchewing. %prep -%setup -q -n %{name}-%{version}-Source +%setup -q %build -%cmake -DCMAKE_INSTALL_PREFIX=%{_usr} -make VERBOSE=1 C_DEFINES="$RPM_OPT_FLAGS" %{?_smp_mflags} +%configure --disable-static +# make -C po update-gmo +make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT -%find_lang %{name} - -%pre -if [ "$1" -gt 1 ] ; then -export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` -gconftool-2 --makefile-uninstall-rule \ -%{_sysconfdir}/gconf/schemas/%{name}.schema >/dev/null || : -fi - -%post -export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` -gconftool-2 --makefile-install-rule \ -%{_sysconfdir}/gconf/schemas/%{name}.schema > /dev/null || : +make DESTDIR=${RPM_BUILD_ROOT} install +rm -f $RPM_BUILD_ROOT%{python_sitearch}/_chewing.la -%preun -if [ "$1" -eq 0 ] ; then -export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` -gconftool-2 --makefile-uninstall-rule \ -%{_sysconfdir}/gconf/schemas/%{name}.schema > /dev/null || : -fi +%find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) -%doc AUTHORS README ChangeLog NEWS COPYING -%{_libexecdir}/ibus-engine-chewing -%{_datadir}/%{name} -%{_datadir}/ibus/component/chewing.xml -%config(noreplace) %{_sysconfdir}/gconf/schemas/%{name}.schema +%doc AUTHORS COPYING README +# %dir %{python_sitearch}/ibus +#%{python_sitearch}/chewing.py* +#%{python_sitearch}/_chewing.so +%dir %{_datadir}/ibus-chewing +%{_bindir}/ibus-engine-chewing +%{_datadir}/ibus-chewing/* +%{_datadir}/ibus/engine/chewing.engine %changelog -* Mon Mar 02 2009 Ding-Yi Chen - 1.0.2.20090302-1 -- Required gconf2 -> GConf2. -- Fix RPM install issues. - -* Fri Feb 27 2009 Ding-Yi Chen - 1.0.1.20090227-1 -- Setting shows/hides KBType, selKeys, and various settings. -- Add gconf schema. -- Fix some memory leaking checked. -- Move some function to cmake_modules. -- Fix Google code issue 281 - -* Tue Feb 24 2009 Fedora Release Engineering - 0.1.1.20081023-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild +* Tue Mar 10 2009 Ding-Yi Chen - 0.1.1.20090129-1 +- Revert F-10 branch to ibus-chewing-0.1.1, as ibus in F-10 is still 0.1.1. -* Wed Feb 18 2009 Ding-Yi Chen - 1.0.0.20090220-1 -- First working version for IBus C - -* Wed Jan 28 2009 Ding-Yi Chen - 1.0.0.20090128-1 +* Wed Jan 28 2009 Ding-Yi Chen - 0.1.1.20090129-1 - Fix the binding with libchewing 0.3.2. -* Sat Nov 29 2008 Ignacio Vazquez-Abrams - 0.1.1.20081023-2 -- Rebuild for Python 2.6 - -* Thu Oct 23 2008 Huang Peng - 0.1.1.20080923-1 -- Update to 0.1.1.20080923. - -* Wed Sep 17 2008 Huang Peng - 0.1.1.20080917-1 -- Update to 0.1.1.20080917. - -* Tue Sep 16 2008 Huang Peng - 0.1.1.20080916-1 -- Update to 0.1.1.20080916. - -* Mon Sep 09 2008 Huang Peng - 0.1.1.20080901-1 -- Update to 0.1.1.20080901. - -* Fri Aug 15 2008 Huang Peng - 0.1.1.20081023-1 +* Fri Aug 15 2008 Huang Peng - 0.1.1.20090129-1 - The first version. diff --git a/import.log b/import.log index 110a00c..c82f326 100644 --- a/import.log +++ b/import.log @@ -1,3 +1,4 @@ ibus-chewing-0_1_1_20080823-1_fc9:HEAD:ibus-chewing-0.1.1.20080823-1.fc9.src.rpm:1219617084 ibus-chewing-1_0_1_20090227-1_fc10:F-10:ibus-chewing-1.0.1.20090227-1.fc10.src.rpm:1235721693 ibus-chewing-1_0_2_20090302-1_fc10:F-10:ibus-chewing-1.0.2.20090302-1.fc10.src.rpm:1235965759 +ibus-chewing-0_1_1_20090129-1_fc10:F-10:ibus-chewing-0.1.1.20090129-1.fc10.src.rpm:1236648721 diff --git a/sources b/sources index 37da663..fab6007 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -40885ad9997236d4d4a601b44cfd33e9 ibus-chewing-1.0.2.20090302-Source.tar.gz +5ad0d2c164c882203f36fe641d5e27f5 ibus-chewing-0.1.1.20090129.tar.gz