From 30f899811b86f3353b3e8ae27022f97c83abb43d Mon Sep 17 00:00:00 2001 From: Mathieu Bridon Date: Mar 04 2015 14:09:25 +0000 Subject: Update to 2.3 --- diff --git a/.gitignore b/.gitignore index d37b792..1df39d0 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /ibus-cangjie-2.0.tar.xz /ibus-cangjie-2.1.tar.xz /ibus-cangjie-2.2.tar.xz +/ibus-cangjie-2.3.tar.xz diff --git a/ibus-cangjie-2.2-Skip-a-unit-test.patch b/ibus-cangjie-2.2-Skip-a-unit-test.patch deleted file mode 100644 index 8c13e48..0000000 --- a/ibus-cangjie-2.2-Skip-a-unit-test.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 6963f9473a640cb6736a1642a955b224491e4d35 Mon Sep 17 00:00:00 2001 -From: Mathieu Bridon -Date: Fri, 25 Apr 2014 15:29:16 +0800 -Subject: [PATCH] Skip a unit test - -This test can only be run in a graphical session anyway. - -However, it should automatically skip itself in non-graphical -environments. - -This fails though, so let's just explicitly skip the test for now in -Fedora builds. ---- - tests/test_prefs.py | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/tests/test_prefs.py b/tests/test_prefs.py -index d1bb438..e568939 100644 ---- a/tests/test_prefs.py -+++ b/tests/test_prefs.py -@@ -37,6 +37,7 @@ class PrefsTestCase(unittest.TestCase): - except ET.ParseError as e: - raise AssertionError(e) - -+ @unittest.skip("Importing Gtk doesn't raise a RuntimeError on recent Fedora") - def test_ui_file_is_valid_gtk_builder(self): - try: - from gi.repository import Gtk --- -1.9.0 - diff --git a/ibus-cangjie.spec b/ibus-cangjie.spec index f1fd09f..c8b5e03 100644 --- a/ibus-cangjie.spec +++ b/ibus-cangjie.spec @@ -2,11 +2,11 @@ Name: ibus-cangjie Summary: IBus engine to input Cangjie and Quick -Version: 2.2 -Release: 4%{?dist} +Version: 2.3 +Release: 1%{?dist} License: GPLv3+ URL: http://cangjians.github.io/projects/%{name} -Source0: http://cangjians.github.io/downloads/%{name}/%{name}-%{version}.tar.xz +Source0: https://github.com/Cangjians/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.xz BuildArch: noarch @@ -23,9 +23,6 @@ Requires: python3-canberra Requires: python3-cangjie >= 1.2 Requires: python3-gobject -# https://github.com/Cangjians/ibus-cangjie/issues/56 -Patch0: ibus-cangjie-2.2-Skip-a-unit-test.patch - # Splitting the packages for Fedora 21+ Obsoletes: ibus-cangjie < 2.2-4 @@ -69,8 +66,6 @@ However, it should work for others as well (e.g to input Simplified Chinese). %prep %setup -q -%patch0 -p1 - %build %configure @@ -107,7 +102,8 @@ fi %files -f %{name}.lang -%doc AUTHORS COPYING README.md +%doc AUTHORS README.md +%license COPYING %{_bindir}/ibus-setup-cangjie %{python3_sitelib}/%{module_name} %{_datadir}/%{name} @@ -131,6 +127,9 @@ fi %changelog +* Wed Mar 04 2015 Mathieu Bridon - 2.3-1 +- Update to 2.3. + * Thu Jul 10 2014 Mathieu Bridon - 2.2-4 - Split the engines into their own subpackages. This makes much more sense for users of a graphical package manager (like diff --git a/sources b/sources index 5039063..40fe492 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6e9cf8cfc2c94f57b85f2aa85e82ca2e ibus-cangjie-2.2.tar.xz +2901823bf8a09ccd58442644a84fd470 ibus-cangjie-2.3.tar.xz