The package rpms/fcitx-libpinyin.git has added or updated architecture specific content in
its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/fcitx-libpinyin.git/commit/?id=cb....
Change:
+ExclusiveArch: %{qt5_qtwebengine_arches}
Thanks.
Full change:
============
commit cbc91ca0e2897aef1ef21e4fe6c1828c283c5605
Author: Robin Lee <cheeselee(a)fedoraproject.org>
Date: Sat May 20 17:41:58 2017 +0800
ExclusiveArch set to %%qt5_qtwebengine_arches
diff --git a/fcitx-libpinyin.spec b/fcitx-libpinyin.spec
index e7b405e..14eb314 100644
--- a/fcitx-libpinyin.spec
+++ b/fcitx-libpinyin.spec
@@ -13,6 +13,8 @@ BuildRequires: libpinyin-tools, glib2-devel, fcitx
BuildRequires: qt5-qtwebengine-devel, dbus-devel
BuildRequires: fcitx-qt5-devel >= 1.1
Requires: fcitx
+# handled by qt5-srpm-macros, which defines %%qt5_qtwebengine_arches
+ExclusiveArch: %{qt5_qtwebengine_arches}
%description
Fcitx-libpinyin is a libpinyin Wrapper for Fcitx.
@@ -69,6 +71,7 @@ fi
%changelog
* Fri May 12 2017 Robin Lee <cheeselee(a)fedoraproject.org> - 0.5.1-1
- Update to 0.5.1
+- ExclusiveArch set to %%qt5_qtwebengine_arches
* Fri Mar 3 2017 Peng Wu <pwu(a)redhat.com> - 0.4.1-4
- Rebuilt for Fedora 27
commit 9991a91e66e57b28a18a0dfb0015c0697030c5eb
Author: Robin Lee <cheeselee(a)fedoraproject.org>
Date: Sat May 20 17:24:06 2017 +0800
Update to 0.5.1
diff --git a/.gitignore b/.gitignore
index 2081656..2a89d62 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@
/fcitx-libpinyin-0.3.91_dict.tar.xz
/fcitx-libpinyin-0.4.0_dict.tar.xz
/fcitx-libpinyin-0.4.1_dict.tar.xz
+/fcitx-libpinyin-0.5.1_dict.tar.xz
diff --git a/fcitx-libpinyin.spec b/fcitx-libpinyin.spec
index 8907d1b..e7b405e 100644
--- a/fcitx-libpinyin.spec
+++ b/fcitx-libpinyin.spec
@@ -1,17 +1,17 @@
Name: fcitx-libpinyin
-Version: 0.4.1
-Release: 4%{?dist}
+Version: 0.5.1
+Release: 1%{?dist}
Summary: Libpinyin Wrapper for Fcitx
Group: System Environment/Libraries
License: GPLv2+
URL:
https://fcitx-im.org/wiki/Libpinyin
Source0:
http://download.fcitx-im.org/fcitx-libpinyin/%{name}-%{version}_dict.tar.xz
-Patch0: fcitx-use-libpinyin-1.9.91.patch
BuildRequires: libpinyin-devel >= 1.9.91
BuildRequires: cmake, fcitx-devel, gettext, intltool, libpinyin-devel
BuildRequires: libpinyin-tools, glib2-devel, fcitx
-BuildRequires: qt-devel, dbus-devel, qtwebkit-devel
+BuildRequires: qt5-qtwebengine-devel, dbus-devel
+BuildRequires: fcitx-qt5-devel >= 1.1
Requires: fcitx
%description
@@ -22,7 +22,6 @@ Libpinyin is a Frontend of the Intelligent Pinyin IME Backend.
%prep
%setup -q -n %{name}-%{version}
-%patch0 -p1 -b .libpinyin
%build
@@ -56,8 +55,8 @@ fi
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files -f %{name}.lang
-%doc AUTHORS ChangeLog COPYING README
-%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog README
+%license COPYING
%{_libdir}/fcitx/%{name}.so
%{_libdir}/fcitx/qt/*.so
%{_datadir}/fcitx/addon/%{name}.conf
@@ -68,6 +67,9 @@ fi
%{_datadir}/icons/hicolor/48x48/status/fcitx-*.png
%changelog
+* Fri May 12 2017 Robin Lee <cheeselee(a)fedoraproject.org> - 0.5.1-1
+- Update to 0.5.1
+
* Fri Mar 3 2017 Peng Wu <pwu(a)redhat.com> - 0.4.1-4
- Rebuilt for Fedora 27
diff --git a/fcitx-use-libpinyin-1.9.91.patch b/fcitx-use-libpinyin-1.9.91.patch
deleted file mode 100644
index dc20b53..0000000
--- a/fcitx-use-libpinyin-1.9.91.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-From 9f811c86fbee906637203ff5f966eadd0ebdd429 Mon Sep 17 00:00:00 2001
-From: Weng Xuetian <wengxt(a)gmail.com>
-Date: Fri, 17 Feb 2017 07:31:58 -0800
-Subject: [PATCH] [libpinyin] port to 1.9.91
-
-Fix #25
----
- cmake/FindLibpinyin.cmake | 10 ++++++----
- src/eim.cpp | 18 +++++++++---------
- src/eim.h | 2 +-
- 3 files changed, 16 insertions(+), 14 deletions(-)
-
-diff --git a/cmake/FindLibpinyin.cmake b/cmake/FindLibpinyin.cmake
-index b32c418..fdd10aa 100644
---- a/cmake/FindLibpinyin.cmake
-+++ b/cmake/FindLibpinyin.cmake
-@@ -16,15 +16,17 @@ if(LIBPINYIN_INCLUDE_DIR AND LIBPINYIN_LIBRARIES)
- endif(LIBPINYIN_INCLUDE_DIR AND LIBPINYIN_LIBRARIES)
-
- find_package(PkgConfig REQUIRED)
--pkg_check_modules(PC_LIBPINYIN "libpinyin>=1.7.0")
--_pkgconfig_invoke("libpinyin" PC_LIBPINYIN LIBPINYININCLUDEDIR ""
"--variable=libpinyinincludedir")
--_pkgconfig_invoke("libpinyin" LIBPINYIN PKGDATADIR ""
"--variable=pkgdatadir")
--_pkgconfig_invoke("libpinyin" LIBPINYIN EXECPREFIX ""
"--variable=exec_prefix")
-+pkg_check_modules(PC_LIBPINYIN "libpinyin>=1.9.91")
-+pkg_get_variable(PC_LIBPINYIN_LIBPINYININCLUDEDIR "libpinyin"
"libpinyinincludedir")
-+pkg_get_variable(LIBPINYIN_PKGDATADIR "libpinyin" "pkgdatadir")
-+pkg_get_variable(LIBPINYIN_EXECPREFIX "libpinyin" "exec_prefix")
-
- find_path(LIBPINYIN_INCLUDE_DIR
- NAMES pinyin.h
- HINTS ${PC_LIBPINYIN_LIBPINYININCLUDEDIR})
-
-+message(${LIBPINYIN_INCLUDE_DIR})
-+
- find_library(LIBPINYIN_LIBRARIES
- NAMES pinyin
- HINTS ${PC_LIBPINYIN_LIBDIR})
-diff --git a/src/eim.cpp b/src/eim.cpp
-index 92f66b3..3987a6c 100644
---- a/src/eim.cpp
-+++ b/src/eim.cpp
-@@ -223,7 +223,7 @@ INPUT_RETURN_VALUE FcitxLibPinyin::doInput(FcitxKeySym sym, unsigned
int state)
- if (m_buf[0] == 0)
- return IRV_TO_PROCESS;
-
-- const std::string sentence = this->sentence();
-+ const std::string sentence = this->sentence(0);
- if (!sentence.empty()) {
- int offset = this->offset();
- int hzlen = 0;
-@@ -569,10 +569,10 @@ void FcitxLibPinyin::updatePreedit(const std::string
&sentence)
- FcitxInputStateSetCursorPos(input, charcurpos);
- }
-
--std::string FcitxLibPinyin::sentence()
-+std::string FcitxLibPinyin::sentence(guint8 index)
- {
- char* sentence = NULL;
-- pinyin_get_sentence(m_inst, &sentence);
-+ pinyin_get_sentence(m_inst, index, &sentence);
- std::string result = sentence ? sentence : "";
- g_free(sentence);
- return result;
-@@ -636,7 +636,7 @@ INPUT_RETURN_VALUE FcitxLibPinyin::getCandWords() {
- }
- }
- pinyin_guess_sentence(m_inst);
-- const std::string sentence = this->sentence();
-+ const std::string sentence = this->sentence(0);
- if (!sentence.empty()) {
- updatePreedit(sentence.c_str());
-
-@@ -721,7 +721,7 @@ INPUT_RETURN_VALUE FcitxLibPinyin::getCandWord(FcitxCandidateWord*
candWord) {
- strcpy(FcitxInputStateGetOutputString(input), candWord->strWord);
- return IRV_COMMIT_STRING;
- } else if (pyCand->idx < 0) {
-- strcpy(FcitxInputStateGetOutputString(input), (sentence() +
candWord->strWord).c_str());
-+ strcpy(FcitxInputStateGetOutputString(input), (sentence(0) +
candWord->strWord).c_str());
- return IRV_COMMIT_STRING;
- } else {
- guint candidateLen = 0;
-@@ -740,10 +740,10 @@ INPUT_RETURN_VALUE FcitxLibPinyin::getCandWord(FcitxCandidateWord*
candWord) {
- if (pinyinOffset() == m_parsedLen) {
- if (m_parsedLen == m_buf.size()) {
- pinyin_guess_sentence(m_inst);
-- const std::string sentence = this->sentence();
-+ const std::string sentence = this->sentence(0);
- if (!sentence.empty()) {
- strcpy(FcitxInputStateGetOutputString(input), sentence.c_str());
-- pinyin_train(m_inst);
-+ pinyin_train(m_inst, 0);
- } else
- strcpy(FcitxInputStateGetOutputString(input), "");
-
-@@ -1010,7 +1010,7 @@ void FcitxLibPinyin::clearData(int type)
- break;
- }
-
-- pinyin_train(m_inst);
-+ pinyin_train(m_inst, 0);
- pinyin_save(context);
- }
-
-@@ -1086,7 +1086,7 @@ void FcitxLibPinyin::import()
- pinyin_end_add_phrases(iter);
-
- if (m_inst) {
-- pinyin_train(m_inst);
-+ pinyin_train(m_inst, 0);
- }
- pinyin_save(context);
- }
-diff --git a/src/eim.h b/src/eim.h
-index 5fcc9b2..aaa2967 100644
---- a/src/eim.h
-+++ b/src/eim.h
-@@ -182,7 +182,7 @@ public:
- void load();
- INPUT_RETURN_VALUE getCandWords();
- INPUT_RETURN_VALUE getCandWord(FcitxCandidateWord* candWord);
-- std::string sentence();
-+ std::string sentence(guint8 index);
- void init();
- void updatePreedit(const std::string &sentence);
- void savePinyinWord(const char *str);
---
-2.7.4
-
diff --git a/sources b/sources
index 92df967..63323f1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (fcitx-libpinyin-0.4.1_dict.tar.xz) =
61c11b099f81b76a78b114762a182b74eee44fa8e0a260b8b654cccd08d5f5f7a7ac9e8f61ebcfa99e3f216c6cb0b4586b7528ae4265ea196e00a2ab2d5953f0
+SHA512 (fcitx-libpinyin-0.5.1_dict.tar.xz) =
85d26e5c036f5fb82005c677d8924e68236f52fab2ddf0e19472e84ca4ae66d9e8e7ec7a84cc7b7cb1da796df2e51f267336640b7957b5caf91ea13e273da411