- updated to 1.6.1

- removed obsolete format patch

diff --git a/ibus-chewing-format.patch b/ibus-chewing-format.patch
deleted file mode 100644 (file)
index 1fb266a..0000000
--- a/ibus-chewing-format.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- ibus-chewing-1.4.14/src/MakerDialogUtil.c.orig     2014-12-15 15:06:27.000000000 +0100
-+++ ibus-chewing-1.4.14/src/MakerDialogUtil.c  2016-04-03 10:57:28.094233446 +0200
-@@ -120,7 +120,7 @@
-       g_snprintf(result, MAKER_DIALOG_VALUE_LENGTH, "%d", intValue);
-       break;
-     case G_TYPE_STRING:
--      g_snprintf(result, MAKER_DIALOG_VALUE_LENGTH,
-+      g_snprintf(result, MAKER_DIALOG_VALUE_LENGTH, "%s",
-                  g_value_get_string(value));
-       break;
-     default:
---- ibus-chewing-1.4.14/src/GSettingsBackend.c.orig    2014-12-15 15:06:27.000000000 +0100
-+++ ibus-chewing-1.4.14/src/GSettingsBackend.c 2016-04-03 11:04:06.900883376 +0200
-@@ -19,6 +19,7 @@
-  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-  */
- 
-+#include <inttypes.h>
- #include <ibus.h>
- #include <glib.h>
- #include "MakerDialogUtil.h"
-@@ -122,7 +123,7 @@
-       g_snprintf(result, MAKER_DIALOG_VALUE_LENGTH, "%u",
-                  g_variant_get_uint32(gVar));
-     } else if (g_variant_type_is_subtype_of(gVType, G_VARIANT_TYPE_UINT64)) {
--      g_snprintf(result, MAKER_DIALOG_VALUE_LENGTH, "%lu",
-+      g_snprintf(result, MAKER_DIALOG_VALUE_LENGTH, "%" PRIu64,
-                  g_variant_get_uint64(gVar));
-     } else if (g_variant_type_is_subtype_of(gVType, G_VARIANT_TYPE_INT16)) {
-       g_snprintf(result, MAKER_DIALOG_VALUE_LENGTH, "%d",
-@@ -131,10 +132,10 @@
-       g_snprintf(result, MAKER_DIALOG_VALUE_LENGTH, "%d",
-                  g_variant_get_int32(gVar));
-     } else if (g_variant_type_is_subtype_of(gVType, G_VARIANT_TYPE_INT64)) {
--      g_snprintf(result, MAKER_DIALOG_VALUE_LENGTH, "%ld",
-+      g_snprintf(result, MAKER_DIALOG_VALUE_LENGTH, "%" PRId64,
-                  g_variant_get_int64(gVar));
-     } else if (g_variant_type_is_subtype_of(gVType, G_VARIANT_TYPE_STRING)) {
--      g_snprintf(result, MAKER_DIALOG_VALUE_LENGTH,
-+      g_snprintf(result, MAKER_DIALOG_VALUE_LENGTH, "%s",
-                  g_variant_get_string(gVar, NULL));
-     }
-     return result;

diff --git a/ibus-chewing.spec b/ibus-chewing.spec
index ee52740e995e1be073904c953bf2cbf30688d8ea..daff6d8f6941718c2b7221cd94f843ef2c9f1ae9 100644 (file)
--- a/ibus-chewing.spec
+++ b/ibus-chewing.spec
@@ -2,16 +2,15 @@ Summary:      The Chewing engine for IBus input platform
 Summary(pl.UTF-8):     Silnik Chewing dla platformy wprowadzania znaków IBus
 Summary(zh_TW.UTF-8):  IBus新酷音輸入法
 Name:          ibus-chewing
-Version:       1.4.14
+Version:       1.6.1
 Release:       1
 License:       GPL v2+
 Group:         Libraries
 #Source0Download: https://github.com/definite/ibus-chewing/releases
 Source0:       https://github.com/definite/ibus-chewing/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: cc2dd8448adeaa740e2ca3f5807e3450
-Patch0:                %{name}-format.patch
+# Source0-md5: 65a947645ceaef03fc18cd6ebbeddb22
 URL:           http://chewing.im/projects/ibus-chewing
-BuildRequires: cmake >= 2.6.2
+BuildRequires: cmake >= 2.8.0
 BuildRequires: cmake-fedora-modules
 BuildRequires: gettext-tools
 BuildRequires: gob2 >= 2.0.16
@@ -54,7 +53,6 @@ Dvorak許氏 及大千26鍵。
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %cmake \
@@ -86,7 +84,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog README RELEASE-NOTES.txt USER-GUIDE
+%doc AUTHORS ChangeLog README.md RELEASE-NOTES.txt USER-GUIDE
 %attr(755,root,root) %{_libexecdir}/ibus-engine-chewing
 %attr(755,root,root) %{_libexecdir}/ibus-setup-chewing
 %{_datadir}/%{name}