From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Mon, 4 Apr 2016 20:00:58 +0000 (+0200)
Subject: - new URLs, updated to 1.9.12
X-Git-Tag: auto/th/ibus-table-1.9.12-1~1
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=2f754eccaab43d765195848a43b078a54ca69eb7;p=packages%2Fibus-table.git

- new URLs, updated to 1.9.12
- removed outdated uppercase-umlauts patch
---

diff --git a/ibus-table-uppercase-umlauts.patch b/ibus-table-uppercase-umlauts.patch
deleted file mode 100644
index 6f542d5..0000000
--- a/ibus-table-uppercase-umlauts.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ru ibus-table-1.3.9.20120904.orig/engine/tabdict.py ibus-table-1.3.9.20120904/engine/tabdict.py
---- ibus-table-1.3.9.20120904.orig/engine/tabdict.py	2012-09-03 16:51:59.000000000 +0200
-+++ ibus-table-1.3.9.20120904/engine/tabdict.py	2012-09-04 14:50:32.186626109 +0200
-@@ -54,7 +54,10 @@
-     # for translit
-     gen_uni('ä'):95,
-     gen_uni('ö'):96,
--    gen_uni('ü'):97
-+    gen_uni('ü'):97,
-+    gen_uni('Ä'):98,
-+    gen_uni('Ö'):99,
-+    gen_uni('Ü'):100
-     }
- 
- tab_key_list = tab_dict.keys()
-ibus-table-1.3.9.20120904/engineだけに発見: tabdict.py.~1~
diff --git a/ibus-table.spec b/ibus-table.spec
index df26819..2807089 100644
--- a/ibus-table.spec
+++ b/ibus-table.spec
@@ -1,22 +1,23 @@
 Summary:	The Table engine for IBus platform
 Summary(pl.UTF-8):	Silnik Table dla platformy IBus
 Name:		ibus-table
-Version:	1.5.0
-Release:	2
-License:	LGPL v2+
+Version:	1.9.12
+Release:	1
+# parts LGPL v2.1+, LGPL v3.0+, GPL v2+ => the result is GPL v3+
+License:	GPL v3+
 Group:		Libraries
-#Source0Download: http://code.google.com/p/ibus/downloads/list
-Source0:	http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
-# Source0-md5:	6f46912e52bf683fa1177787507205f5
-Patch0:		ibus-table-uppercase-umlauts.patch
-URL:		http://code.google.com/p/ibus/
+#Source0Download: https://github.com/kaio/ibus-table/releases
+Source0:	https://github.com/kaio/ibus-table/releases/download/%{version}/%{name}-%{version}.tar.gz
+# Source0-md5:	7f4f9474d3024f627e995397e9e5ce70
+URL:		https://github.com/kaio/ibus-table
 BuildRequires:	gettext-tools >= 0.16.1
 BuildRequires:	ibus-devel > 1.4.99
-BuildRequires:	python >= 1:2.5
-Requires:	ibus > 1.4.99
+BuildRequires:	python3 >= 1:3.3
+BuildRequires:	python3-modules >= 1:3.3
+BuildRequires:	sed >= 4.0
 Requires:	%{name}-engine = %{version}-%{release}
-Requires:	ibus >= 1.3.0
-Requires:	python-dbus
+Requires:	ibus >= 1.4.99
+Requires:	python-pygobject3 >= 3.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_libexecdir	%{_libdir}/ibus
@@ -30,9 +31,9 @@ Silnik Table dla platformy IBus.
 %package engine
 Summary:	IBus Table engine
 Summary(pl.UTF-8):	Silnik IBus Table
+License:	LGPL v3+
 Group:		Applications/Text
-Requires:	python-modules >= 1:2.5
-Requires:	python-modules-sqlite >= 1:2.5
+Requires:	python3-modules >= 1:3.3
 
 %description engine
 IBus Table engine.
@@ -43,6 +44,7 @@ Silnik IBus Table.
 %package devel
 Summary:	Development files for ibus-table
 Summary(pl.UTF-8):	Pliki programistyczne dla ibus-table
+License:	LGPL v3+
 Group:		Development/Tools
 Requires:	%{name}-engine = %{version}-%{release}
 
@@ -54,7 +56,9 @@ Pliki programistyczne dla ibus-table.
 
 %prep
 %setup -q
-%patch0 -p1
+
+# one python version is enough
+%{__sed} -i -e '1s,/usr/bin/python$,%{__python3},' engine/chinese_variants.py
 
 %build
 %configure
@@ -75,14 +79,15 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README
+%attr(755,root,root) %{_libexecdir}/ibus-setup-table
 %attr(755,root,root) %{_libexecdir}/ibus-engine-table
 %{_datadir}/ibus/component/table.xml
 %{_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/table.py
+%{_datadir}/%{name}/engine/__pycache__/factory.cpython-*.py[co]
+%{_datadir}/%{name}/engine/__pycache__/main.cpython-*.py[co]
+%{_datadir}/%{name}/engine/__pycache__/table.cpython-*.py[co]
 %dir %{_datadir}/%{name}/icons
 %{_datadir}/%{name}/icons/%{name}.svg
 %{_datadir}/%{name}/icons/full-letter.svg
@@ -102,6 +107,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}/icons/scb-mode.svg
 %{_datadir}/%{name}/icons/tc-mode.svg
 %{_datadir}/%{name}/icons/tcb-mode.svg
+%dir %{_datadir}/%{name}/setup
+%{_datadir}/%{name}/setup/*.py
+%{_datadir}/%{name}/setup/*.ui
+%{_datadir}/%{name}/setup/__pycache__
+%{_desktopdir}/ibus-setup-table.desktop
 
 %files engine -f %{name}.lang
 %defattr(644,root,root,755)
@@ -109,22 +119,20 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_datadir}/%{name}/data
 %{_datadir}/%{name}/data/pinyin_table.txt.bz2
 %dir %{_datadir}/%{name}/engine
+%{_datadir}/%{name}/engine/chinese_variants.py
+%{_datadir}/%{name}/engine/ibus_table_location.py
 %{_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
+%dir %{_datadir}/%{name}/engine/__pycache__
+%{_datadir}/%{name}/engine/__pycache__/chinese_variants.cpython-*.py[co]
+%{_datadir}/%{name}/engine/__pycache__/ibus_table_location.cpython-*.py[co]
+%{_datadir}/%{name}/engine/__pycache__/tabcreatedb.cpython-*.py[co]
+%{_datadir}/%{name}/engine/__pycache__/tabsqlitedb.cpython-*.py[co]
 %dir %{_datadir}/%{name}/tables
 %{_datadir}/%{name}/tables/template.txt
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/%{name}-createdb
-%{_pkgconfigdir}/%{name}.pc
+%attr(755,root,root) %{_bindir}/ibus-table-createdb
+%{_pkgconfigdir}/ibus-table.pc
+%{_mandir}/man1/ibus-table-createdb.1*