diff --git a/.gitignore b/.gitignore index 5118a70..f1b736f 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ ibus-table-1.3.0.20100621.tar.gz /ibus-table-1.5.0.20140203.tar.gz /ibus-table-1.5.0.20140205.tar.gz /ibus-table-1.5.0.20140218.tar.gz +/ibus-table-1.5.0.20140306.tar.gz diff --git a/ibus-table.spec b/ibus-table.spec index 9fc72b7..4ed9998 100644 --- a/ibus-table.spec +++ b/ibus-table.spec @@ -1,5 +1,5 @@ Name: ibus-table -Version: 1.5.0.20140218 +Version: 1.5.0.20140306 Release: 1%{?dist} Summary: The Table engine for IBus platform License: LGPLv2+ @@ -7,8 +7,9 @@ Group: System Environment/Libraries URL: http://code.google.com/p/ibus/ Source0: http://mfabian.fedorapeople.org/ibus-table/%{name}-%{version}.tar.gz Requires: ibus > 1.3.0 +Requires: python3 >= 3.3 BuildRequires: ibus-devel > 1.3.0 -BuildRequires: python2-devel +BuildRequires: python3-devel Obsoletes: ibus-table-additional < 1.2.0.20100111-5 @@ -30,11 +31,13 @@ Development files for %{name}. %setup -q %build +export PYTHON=%{__python3} %configure --disable-static --disable-additional %__make %{?_smp_mflags} %install %__rm -rf $RPM_BUILD_ROOT +export PYTHON=%{__python3} %__make DESTDIR=${RPM_BUILD_ROOT} NO_INDEX=true install pkgconfigdir=%{_datadir}/pkgconfig %find_lang %{name} @@ -46,61 +49,8 @@ Development files for %{name}. %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING README -%dir %{_datadir}/%{name} -%dir %{_datadir}/%{name}/engine -%dir %{_datadir}/%{name}/tables -%dir %{_datadir}/%{name}/icons -%dir %{_datadir}/%{name}/data -%dir %{_datadir}/%{name}/setup +%{_datadir}/%{name} %{_datadir}/ibus/component/table.xml -%{_datadir}/%{name}/icons/%{name}.svg -%{_datadir}/%{name}/icons/full-letter.svg -%{_datadir}/%{name}/icons/full-punct.svg -%{_datadir}/%{name}/icons/half-letter.svg -%{_datadir}/%{name}/icons/half-punct.svg -%{_datadir}/%{name}/icons/onechar.svg -%{_datadir}/%{name}/icons/phrase.svg -%{_datadir}/%{name}/icons/py-mode.svg -%{_datadir}/%{name}/icons/tab-mode.svg -%{_datadir}/%{name}/icons/chinese.svg -%{_datadir}/%{name}/icons/acommit.svg -%{_datadir}/%{name}/icons/english.svg -%{_datadir}/%{name}/icons/ncommit.svg -%{_datadir}/%{name}/icons/cb-mode.svg -%{_datadir}/%{name}/icons/sc-mode.svg -%{_datadir}/%{name}/icons/scb-mode.svg -%{_datadir}/%{name}/icons/tc-mode.svg -%{_datadir}/%{name}/icons/tcb-mode.svg -%{_datadir}/%{name}/data/pinyin_table.txt.bz2 -%{_datadir}/%{name}/engine/chinese_variants.py -%{_datadir}/%{name}/engine/chinese_variants.pyc -%{_datadir}/%{name}/engine/chinese_variants.pyo -%{_datadir}/%{name}/engine/factory.py -%{_datadir}/%{name}/engine/factory.pyc -%{_datadir}/%{name}/engine/factory.pyo -%{_datadir}/%{name}/engine/main.py -%{_datadir}/%{name}/engine/main.pyc -%{_datadir}/%{name}/engine/main.pyo -%{_datadir}/%{name}/engine/tabcreatedb.py -%{_datadir}/%{name}/engine/tabcreatedb.pyc -%{_datadir}/%{name}/engine/tabcreatedb.pyo -%{_datadir}/%{name}/engine/tabdict.py -%{_datadir}/%{name}/engine/tabdict.pyc -%{_datadir}/%{name}/engine/tabdict.pyo -%{_datadir}/%{name}/engine/table.py -%{_datadir}/%{name}/engine/table.pyc -%{_datadir}/%{name}/engine/table.pyo -%{_datadir}/%{name}/engine/tabsqlitedb.py -%{_datadir}/%{name}/engine/tabsqlitedb.pyc -%{_datadir}/%{name}/engine/tabsqlitedb.pyo -%{_datadir}/%{name}/tables/template.txt -%{_datadir}/%{name}/setup/ibus-table-preferences.ui -%{_datadir}/%{name}/setup/main.py -%{_datadir}/%{name}/setup/main.pyc -%{_datadir}/%{name}/setup/main.pyo -%{_datadir}/%{name}/setup/version.py -%{_datadir}/%{name}/setup/version.pyc -%{_datadir}/%{name}/setup/version.pyo %{_bindir}/%{name}-createdb %{_libexecdir}/ibus-engine-table %{_libexecdir}/ibus-setup-table @@ -111,6 +61,13 @@ Development files for %{name}. %{_datadir}/pkgconfig/%{name}.pc %changelog +* Thu Mar 06 2014 Mike FABIAN - 1.5.0.20140306-1 +- update to latest upstream +- Resolves: rhbz#1072940 - Left Shift stopped work for ibus-table-1.5.0.20140218-1.fc20.noarch +- port from Python2 to Python3, require Python3 in this rpm now +- fix directory for setup tool, setup tool should work now +- add profiling support + * Tue Feb 18 2014 Mike FABIAN - 1.5.0.20140218-1 - update to latest upstream - Resolves: rhbz#1061345 - ibus-table shows entered text in password fields @@ -268,7 +225,7 @@ Development files for %{name}. * Tue Aug 04 2009 Caius 'kaio' Chance - 1.2.0.20090804-1.fc12 - Cleaned up unused dcommit contents. -* Tue Aug 03 2009 Caius 'kaio' Chance - 1.2.0.20090803-1.fc12 +* Mon Aug 03 2009 Caius 'kaio' Chance - 1.2.0.20090803-1.fc12 - Updated to upstream. * Fri Jul 24 2009 Fedora Release Engineering - 1.2.0.20090625-3 @@ -322,11 +279,11 @@ Development files for %{name}. * Mon Dec 1 2008 Peng Huang - 0.1.1.20081014-2 - Modified spec file to own all directories created by ibus-table. -* Fri Oct 14 2008 Peng Huang - 0.1.1.20081014-1 +* Tue Oct 14 2008 Peng Huang - 0.1.1.20081014-1 - Update to 0.1.1.20081014. * Mon Sep 01 2008 Peng Huang - 0.1.1.20080901-1 - Update to 0.1.1.20080901. -* Wed Aug 19 2008 Yu Yuwei - 0.1.1.20080829-1 +* Tue Aug 19 2008 Yu Yuwei - 0.1.1.20080829-1 - The first version. diff --git a/sources b/sources index ae39ab3..9090074 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4c78a2fe970b28c38145545e9de611b3 ibus-table-1.5.0.20140218.tar.gz +d8e9d6ce022a60d86ccb9ecee521f52c ibus-table-1.5.0.20140306.tar.gz