From 05d1a6bfb000adc4acce96eb4551e5583ef7b13c5ca8969e2e799fbf50ee6934 Mon Sep 17 00:00:00 2001 From: Marguerite Su Date: Sat, 30 May 2015 06:30:53 +0000 Subject: [PATCH 1/2] Accepting request 309274 from home:MargueriteSu:branches:M17N update version 4.2.9 OBS-URL: https://build.opensuse.org/request/show/309274 OBS-URL: https://build.opensuse.org/package/show/M17N/fcitx?expand=0&rev=116 --- baselibs.conf | 16 ++-- fcitx-4.2.8.6_dict.tar.xz | 3 - fcitx-4.2.9_dict.tar.xz | 3 + fcitx.changes | 19 +++++ fcitx.spec | 154 +++++++------------------------------- 5 files changed, 59 insertions(+), 136 deletions(-) delete mode 100644 fcitx-4.2.8.6_dict.tar.xz create mode 100644 fcitx-4.2.9_dict.tar.xz diff --git a/baselibs.conf b/baselibs.conf index bd5eeeb..47c925b 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,11 +1,11 @@ -libfcitx-4_2_8 +libfcitx-4_2_9 requires "fcitx = " - obsoletes "libfcitx- < " - provides "libfcitx- = " + obsoletes "libfcitx- < " + provides "libfcitx- = " post "/sbin/ldconfig" - postun "/sbin/ldconfig" + postun "/sbin/ldconfig" fcitx-gtk2 - requires "libfcitx-4_2_8- = " + requires "libfcitx-4_2_9- = " post "%if "%_lib" == "lib64"" post "%{_bindir}/gtk-query-immodules-2.0-64 --update-cache" post "%else" @@ -17,8 +17,8 @@ fcitx-gtk2 postun "%{_bindir}/gtk-query-immodules-2.0 --update-cache" postun "%endif" fcitx-gtk3 - requires "libfcitx-4_2_8- = " - post "%if "%_lib" == "lib64"" + requires "libfcitx-4_2_9- = " + post "%if "%_lib" == "lib64"" post "%{_bindir}/gtk-query-immodules-3.0-64 --update-cache" post "%else" post "%{_bindir}/gtk-query-immodules-3.0 --update-cache" @@ -29,4 +29,4 @@ fcitx-gtk3 postun "%{_bindir}/gtk-query-immodules-3.0 --update-cache" postun "%endif" fcitx-qt4 - requires "libfcitx-4_2_8- = " + requires "libfcitx-4_2_9- = " diff --git a/fcitx-4.2.8.6_dict.tar.xz b/fcitx-4.2.8.6_dict.tar.xz deleted file mode 100644 index 1d788ad..0000000 --- a/fcitx-4.2.8.6_dict.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:91034e9ef976bbe2649a96b67adf0c133d64e2c0d53be440cc40a4370569d597 -size 8694328 diff --git a/fcitx-4.2.9_dict.tar.xz b/fcitx-4.2.9_dict.tar.xz new file mode 100644 index 0000000..9cc149c --- /dev/null +++ b/fcitx-4.2.9_dict.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3a935b7098fe573b126f8e393d93bccc6d4e4e9988830430fa9b1c87876bfc6c +size 8675292 diff --git a/fcitx.changes b/fcitx.changes index 97b93c9..6868b62 100644 --- a/fcitx.changes +++ b/fcitx.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Sat May 30 05:43:52 UTC 2015 - i@marguerite.su + +- update version 4.2.9 + * [qt,core]use xkbcommon for compose + * [qt,keyboard]use xkbcommon better by checking return value + * [qt, core] adjust xkb context log level + * [qt,core] adjust init order to ensure set log level works + * [unicode] fix decimal unicode search + * [qt] fix compose when fcitx is not running + * [gtk] use xkbcommon also for gtk im context + * [gtk] reset xkb compose state when context reset + * [gtk, gclient] make connection and xkb context/table of + fcitxclient shared + * [gclient] fix some gtk-doc comment + * [qt] disable qt lib by option + * [core] fix invalid global imname +- clean specfile, drop fedora support + ------------------------------------------------------------------- Thu Apr 2 14:20:58 UTC 2015 - i@marguerite.su diff --git a/fcitx.spec b/fcitx.spec index c228b06..11c6d17 100644 --- a/fcitx.spec +++ b/fcitx.spec @@ -16,10 +16,10 @@ # -%define libver -4_2_8 +%define libver -4_2_9 Name: fcitx -Version: 4.2.8.6 +Version: 4.2.9 Release: 0 Summary: Flexible Context-aware Input Tool with eXtension License: GPL-2.0+ @@ -36,19 +36,11 @@ Source9: macros.%{name} Source99: baselibs.conf Patch: fcitx-4.2.8.5-fix-bashisms.patch BuildRequires: cairo-devel -%if 0%{?suse_version} BuildRequires: dbus-1-devel BuildRequires: dbus-1-glib-devel -BuildRequires: update-desktop-files -%endif -%if 0%{?fedora_version} -BuildRequires: dbus-devel -BuildRequires: dbus-glib-devel -BuildRequires: desktop-file-utils -BuildRequires: libxkbfile-devel -%endif BuildRequires: enchant-devel BuildRequires: iso-codes-devel +BuildRequires: update-desktop-files # Dictionary ownership BuildRequires: kde4-filesystem %if 0%{?suse_version} >= 1140 @@ -56,21 +48,22 @@ BuildRequires: kdebase4-runtime-branding-openSUSE %endif BuildRequires: libpresage-devel BuildRequires: pango-devel -%if 0%{?suse_version} >= 1110 || 0%{?fedora_version} +%if 0%{?suse_version} >= 1110 BuildRequires: fdupes %endif -%if 0%{?suse_version} > 1110 || 0%{?fedora_version} +%if 0%{?suse_version} > 1110 BuildRequires: libqt4-devel %endif -%if 0%{?suse_version} <= 1210 || 0%{?fedora_version} +%if 0%{?suse_version} <= 1210 BuildRequires: lua-devel %else BuildRequires: lua51-devel %endif BuildRequires: cmake +BuildRequires: extra-cmake-modules BuildRequires: gtk2-devel BuildRequires: opencc-devel -%if 0%{?suse_version} >= 1140 || 0%{?fedora_version} +%if 0%{?suse_version} >= 1140 BuildRequires: gobject-introspection-devel BuildRequires: gtk3-devel %endif @@ -80,13 +73,12 @@ BuildRequires: libxml2-devel BuildRequires: xz Requires: %{name}-gtk2 = %{version}-%{release} Requires: lib%{name}%{libver} = %{version}-%{release} -%if 0%{?suse_version} >= 1140 || 0%{?fedora_version} +%if 0%{?suse_version} >= 1140 Requires: %{name}-gtk3 = %{version}-%{release} %endif -%if 0%{?suse_version} > 1110 || 0%{?fedora_version} +%if 0%{?suse_version} > 1110 Requires: %{name}-qt4 = %{version}-%{release} %endif -%if 0%{?suse_version} Recommends: %{name}-pinyin = %{version}-%{release} Recommends: %{name}-table = %{version}-%{release} # These libraries are dlopen-ed in fcitx at runtime @@ -96,16 +88,6 @@ Recommends: libopencc2 Recommends: libpresage1 Recommends: libenchant1 Requires: %{name}-branding = %{version} -%endif -%if 0%{?fedora_version} -Requires: %{name}-pinyin = %{version}-%{release} -Requires: %{name}-table = %{version}-%{release} -Requires: enchant -Requires: libpresage1 -Requires: opencc -Requires(post): %{_sbindir}/alternatives -Requires(postun): %{_sbindir}/alternatives -%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: locale(ko;zh_CN;zh_SG) @@ -144,18 +126,13 @@ Requires(postun): gtk2 %description gtk2 GTK+ version 2 input module for Fcitx input method rfamework. -%if 0%{?suse_version} >= 1140 || 0%{?fedora_version} +%if 0%{?suse_version} >= 1140 %package gtk3 Summary: Gtk3 IM module for %{name} Group: System/I18n/Chinese Requires: %{name} = %{version}-%{release} -%if 0%{?suse_version} %gtk3_immodule_requires -%else -Requires(post): gtk3 -Requires(postun): gtk3 -%endif %description gtk3 GTK+ version 3 input module for Fcitx input method framework. @@ -171,7 +148,8 @@ Pinyin and QuWei input methods. It's flexible and fast. This package provides the GObject Introspection bindings for Fcitx. %endif -%if 0%{?suse_version} > 1110 || 0%{?fedora_version} + +%if 0%{?suse_version} > 1110 %package qt4 Summary: Qt4 IM module for %{name} @@ -213,7 +191,7 @@ It's the basic component for other users except some Chinese. Summary: Simplified Chinese Tsang-Jei(Cangjie) table for %{name} Group: System/I18n/Chinese Requires: %{name}-table = %{version}-%{release} -%if 0%{?suse_version} >= 1140 || 0%{?fedora_version} +%if 0%{?suse_version} >= 1140 BuildArch: noarch %endif @@ -224,7 +202,7 @@ Fcitx Tsang Jei (Cang Jie) input tables for Simplified Chinese. Summary: Telegram(Dianbao) table for %{name} Group: System/I18n/Chinese Requires: %{name}-table = %{version}-%{release} -%if 0%{?suse_version} >= 1140 || 0%{?fedora_version} +%if 0%{?suse_version} >= 1140 BuildArch: noarch %endif @@ -235,7 +213,7 @@ Fcitx Telegram (Dian Bao) input tables for Simplified Chinese. Summary: Two stroke(Erbi) table for %{name} Group: System/I18n/Chinese Requires: %{name}-table = %{version}-%{release} -%if 0%{?suse_version} >= 1140 || 0%{?fedora_version} +%if 0%{?suse_version} >= 1140 BuildArch: noarch %endif @@ -246,7 +224,7 @@ Fcitx Two Stroke (Er Bi) input tables for Simplified Chinese. Summary: Icefrog Holography(QXM) table for %{name} Group: System/I18n/Chinese Requires: %{name}-table = %{version}-%{release} -%if 0%{?suse_version} >= 1140 || 0%{?fedora_version} +%if 0%{?suse_version} >= 1140 BuildArch: noarch %endif @@ -257,7 +235,7 @@ Fcitx Icefrog Holography (Bing Chan Quan Xi, or QXM) input tables for Simplified Summary: Evening Breeze(Wanfeng) table for %{name} Group: System/I18n/Chinese Requires: %{name}-table = %{version}-%{release} -%if 0%{?suse_version} >= 1140 || 0%{?fedora_version} +%if 0%{?suse_version} >= 1140 BuildArch: noarch %endif @@ -269,7 +247,7 @@ Summary: Wubi and pinyin(wubi-pinyin) table for %{name} Group: System/I18n/Chinese Provides: locale(fcitx-table:zh-cn;) Requires: %{name}-table = %{version}-%{release} -%if 0%{?suse_version} >= 1140 || 0%{?fedora_version} +%if 0%{?suse_version} >= 1140 BuildArch: noarch %endif @@ -283,7 +261,7 @@ Summary: Wubi table for %{name} Group: System/I18n/Chinese Provides: locale(fcitx-table:zh-cn;) Requires: %{name}-table = %{version}-%{release} -%if 0%{?suse_version} >= 1140 || 0%{?fedora_version} +%if 0%{?suse_version} >= 1140 BuildArch: noarch %endif @@ -296,7 +274,7 @@ Wubi in Fcitx is based on wubi x86. Summary: Nature(Ziran) table for %{name} Group: System/I18n/Chinese Requires: %{name}-table = %{version}-%{release} -%if 0%{?suse_version} >= 1140 || 0%{?fedora_version} +%if 0%{?suse_version} >= 1140 BuildArch: noarch %endif @@ -321,8 +299,6 @@ Requires: lib%{name}%{libver} = %{version}-%{release} %description pinyin-tools Tools to convert txt or scel(sougou pinyin data format) pinyin sheets to fcitx match lists. -%if 0%{?suse_version} - %package branding-openSUSE Summary: openSUSE default Skins for Fcitx Group: System/I18n/Chinese @@ -353,13 +329,11 @@ New Air skin for Fcitx, inspired by KDE Air theme. You can either use this package or download from kde-look.org using knewstaff in fcitx-config-kde4. -%endif - %package skin-classic Summary: Fcitx Classic Skin Group: System/I18n/Chinese Requires: %{name} = %{version}-%{release} -%if 0%{?suse_version} >= 1140 || 0%{?fedora_version} +%if 0%{?suse_version} >= 1140 BuildArch: noarch %endif @@ -372,7 +346,7 @@ You can either use this package or download from kde-look.org using knewstaff in Summary: Fcitx Dark Skin Group: System/I18n/Chinese Requires: %{name} = %{version}-%{release} -%if 0%{?suse_version} >= 1140 || 0%{?fedora_version} +%if 0%{?suse_version} >= 1140 BuildArch: noarch %endif @@ -406,7 +380,7 @@ cmake .. \ -DOPENCC_LIBRARY_FILENAME=libopencc.so.2 \ -DENCHANT_LIBRARY_FILENAME=libenchant.so.1 \ -DPRESAGE_LIBRARY_FILENAME=libpresage.so.1 \ -%if 0%{?suse_version} >= 1140 || 0%{?fedora_version} +%if 0%{?suse_version} >= 1140 -DENABLE_GTK3_IM_MODULE=On \ %endif %if 0%{?suse_version} <= 1210 @@ -427,12 +401,9 @@ make %install cd build -# support fedora 17 -make DESTDIR=%{buildroot} install - +%makeinstall cd .. -%if 0%{?suse_version} # install openSUSE skins tar -xzf %{SOURCE8} mv openSUSE-themes/Harlequin %{buildroot}%{_datadir}/%{name}/skin/ @@ -449,28 +420,15 @@ cp -r openSUSE-themes/input-Harlequin.svgz %{buildroot}%{_kde4_appsdir}/desktopt pushd %{buildroot}%{_datadir}/%{name}/configdesc sed -i 's/DefaultValue=default/DefaultValue=Harlequin/' %{buildroot}%{_datadir}/%{name}/configdesc/fcitx-classic-ui.desc popd -%endif # fix desktop file sed -i "s/x-fskin/x-fskin;/" %{buildroot}%{_datadir}/applications/fcitx-skin-installer.desktop -%if 0%{?suse_version} %suse_update_desktop_file fcitx Utility DesktopUtility %suse_update_desktop_file fcitx-skin-installer Utility DesktopUtility %suse_update_desktop_file -r fcitx-configtool System X-SuSE-SystemSetup -%endif - -%if 0%{?fedora_version} -desktop-file-install --add-category="Utility" --delete-original --dir=%{buildroot}%{_datadir}/applications \ -%{buildroot}/%{_datadir}/applications/fcitx.desktop -desktop-file-install --add-category="Utility" --delete-original --dir=%{buildroot}%{_datadir}/applications \ -%{buildroot}/%{_datadir}/applications/fcitx-skin-installer.desktop -desktop-file-install --add-category="System" --delete-original --dir=%{buildroot}%{_datadir}/applications \ -%{buildroot}/%{_datadir}/applications/fcitx-configtool.desktop -%endif # fix doc -%if 0%{?suse_version} mkdir -p %{buildroot}%{_docdir}/ mv %{buildroot}%{_datadir}/doc/%{name} %{buildroot}%{_docdir}/ cp -r %{SOURCE2} %{buildroot}%{_docdir}/%{name}/ @@ -478,19 +436,8 @@ cp -r %{SOURCE3} %{buildroot}%{_docdir}/%{name}/ cp -r AUTHORS %{buildroot}%{_docdir}/%{name}/ cp -r ChangeLog %{buildroot}%{_docdir}/%{name}/ cp -r COPYING %{buildroot}%{_docdir}/%{name}/ -%endif -%if 0%{?fedora_version} -mkdir %{buildroot}%{_docdir}/packages/ -mv %{buildroot}%{_docdir}/%{name}/ %{buildroot}%{_docdir}/packages/ -cp -r %{SOURCE2} %{buildroot}%{_docdir}/packages/%{name}/ -cp -r %{SOURCE3} %{buildroot}%{_docdir}/packages/%{name}/ -cp -r AUTHORS %{buildroot}%{_docdir}/packages/%{name}/ -cp -r ChangeLog %{buildroot}%{_docdir}/packages/%{name}/ -cp -r COPYING %{buildroot}%{_docdir}/packages/%{name}/ -%endif # create autostart -%if 0%{?suse_version} mkdir -p %{buildroot}%{_sysconfdir}/X11/xim.d/ install -m 644 %{S:1} %{buildroot}%{_sysconfdir}/X11/xim.d/fcitx @@ -508,12 +455,6 @@ popd # bnc#801319 remove the unneeded fcitx-autostart.desktop which blocks ibus from starting. rm -rf %{buildroot}%{_sysconfdir}/xdg/autostart/%{name}-autostart.desktop -%endif - -%if 0%{?fedora_version} -mkdir -pv %{buildroot}%{_sysconfdir}/X11/xinit/xinput.d/ -install -pm 644 -D %{SOURCE7} %{buildroot}%{_sysconfdir}/X11/xinit/xinput.d/fcitx.conf -%endif # install rpm macros install -D -m644 %{SOURCE9} %{buildroot}%{_sysconfdir}/rpm/macros.%{name} @@ -525,10 +466,6 @@ install -D -m644 %{SOURCE9} %{buildroot}%{_sysconfdir}/rpm/macros.%{name} %if 0%{?suse_version} >= 1110 %fdupes %{buildroot} -%else -%if 0%{?fedora_version} -fdupes -n -q -r %{buildroot} -%endif %endif %post gtk2 @@ -537,7 +474,7 @@ fdupes -n -q -r %{buildroot} %postun gtk2 %gtk2_immodule_postun -%if 0%{?suse_version} >= 1140 || 0%{?fedora_version} +%if 0%{?suse_version} >= 1140 %post gtk3 %gtk3_immodule_post @@ -554,29 +491,9 @@ fi %endif -# fedora autostart -%if 0%{?fedora_version} -%post -/sbin/ldconfig -%{_sbindir}/alternatives --install %{_sysconfdir}/X11/xinit/xinputrc xinputrc %{_sysconfdir}/X11/xinit/xinput.d/fcitx.conf 55 || : -update-desktop-database %{_datadir}/applications &>/dev/null || : - -%postun -/sbin/ldconfig -if [ "$1" = "0" ]; then - %{_sbindir}/alternatives --remove xinputrc %{_sysconfdir}/X11/xinit/xinput.d/fcitx.conf || : - # if alternative was set to manual, reset to auto - [ -L %{_sysconfdir}/alternatives/xinputrc -a "`readlink %{_sysconfdir}/alternatives/xinputrc`" = "%{_sysconfdir}/X11/xinit/xinput.d/fcitx.conf" ] && %{_sbindir}/alternatives --auto xinputrc || : -fi -update-desktop-database %{_datadir}/applications &>/dev/null || - -%endif - -%if 0%{?suse_version} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig -%endif %post -n lib%{name}%{libver} -p /sbin/ldconfig @@ -599,15 +516,8 @@ update-desktop-database %{_datadir}/applications &>/dev/null || %{_mandir}/man1/fcitx.1.gz %{_mandir}/man1/fcitx-remote.1.gz %{_libdir}/%{name}/ -%if 0%{?suse_version} %config %{_sysconfdir}/X11/xim.d/ %doc %{_docdir}/%{name}/ -%endif -%if 0%{?fedora_version} -%config %{_sysconfdir}/X11/xinit/xinput.d/ -%doc %{_docdir}/packages/%{name}/ -%config %{_sysconfdir}/xdg/autostart/%{name}-autostart.desktop -%endif # excludes %exclude %{_datadir}/%{name}/pinyin @@ -625,11 +535,9 @@ update-desktop-database %{_datadir}/applications &>/dev/null || %exclude %{_libdir}/%{name}/libexec/comp-spell-dict %exclude %{_libdir}/%{name}/libexec/fcitx-po-parser %exclude %{_libdir}/%{name}/libexec/fcitx-scanner -%if 0%{?suse_version} %exclude %{_datadir}/%{name}/skin/Harlequin %exclude %{_datadir}/%{name}/skin/Dartmouth %exclude %{_datadir}/%{name}/skin/NewAir -%endif %exclude %{_datadir}/%{name}/skin/classic %exclude %{_datadir}/%{name}/skin/dark @@ -642,7 +550,7 @@ update-desktop-database %{_datadir}/applications &>/dev/null || %defattr(-,root,root) %{_libdir}/gtk-2.0/* -%if 0%{?suse_version} >= 1140 || 0%{?fedora_version} +%if 0%{?suse_version} >= 1140 %files gtk3 %defattr(-,root,root) @@ -734,8 +642,6 @@ update-desktop-database %{_datadir}/applications &>/dev/null || %{_mandir}/man1/mb2org.1.gz %{_mandir}/man1/scel2org.1.gz -%if 0%{?suse_version} - %files branding-openSUSE %defattr(-,root,root) %{_datadir}/%{name}/skin/Harlequin @@ -756,8 +662,6 @@ update-desktop-database %{_datadir}/applications &>/dev/null || %defattr(-,root,root) %{_datadir}/%{name}/skin/NewAir -%endif - %files skin-classic %defattr(-,root,root) %{_datadir}/%{name}/skin/classic @@ -776,11 +680,11 @@ update-desktop-database %{_datadir}/applications &>/dev/null || %{_libdir}/%{name}/libexec/fcitx-scanner %{_libdir}/pkgconfig/*.pc %{_datadir}/cmake/ -%if 0%{?suse_version} >= 1140 || 0%{?fedora_version} +%if 0%{?suse_version} >= 1140 %{_datadir}/gir-1.0/Fcitx-1.0.gir %endif -%if 0%{?suse_version} > 1110 || 0%{?fedora_version} +%if 0%{?suse_version} > 1110 %files qt4 %defattr(-,root,root) From 83a6eafaba029c01cfcd62c08b7eacf6c8896e022dc1b2752833b42895202b2e Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 1 Jun 2015 07:37:19 +0000 Subject: [PATCH 2/2] Accepting request 309370 from home:Ledest:bashisms fix BuildRequires OBS-URL: https://build.opensuse.org/request/show/309370 OBS-URL: https://build.opensuse.org/package/show/M17N/fcitx?expand=0&rev=117 --- fcitx.changes | 5 +++++ fcitx.spec | 2 ++ 2 files changed, 7 insertions(+) diff --git a/fcitx.changes b/fcitx.changes index 6868b62..bb1fc14 100644 --- a/fcitx.changes +++ b/fcitx.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat May 30 17:22:00 UTC 2015 - Led + +- fix BuildRequires + ------------------------------------------------------------------- Sat May 30 05:43:52 UTC 2015 - i@marguerite.su diff --git a/fcitx.spec b/fcitx.spec index 11c6d17..9af814a 100644 --- a/fcitx.spec +++ b/fcitx.spec @@ -70,7 +70,9 @@ BuildRequires: gtk3-devel BuildRequires: gcc-c++ BuildRequires: libicu-devel BuildRequires: libxml2-devel +BuildRequires: pkg-config BuildRequires: xz +BuildRequires: pkgconfig(xkbcommon) >= 0.5.0 Requires: %{name}-gtk2 = %{version}-%{release} Requires: lib%{name}%{libver} = %{version}-%{release} %if 0%{?suse_version} >= 1140