From 946b07514cd1bd671d458568b92dc7071340a1aa53f630795eaf47a418eb248a Mon Sep 17 00:00:00 2001 From: Marguerite Su Date: Wed, 11 Nov 2020 06:28:05 +0000 Subject: [PATCH] Accepting request 847660 from home:MargueriteSu:branches:M17N - update version 5.0.1 OBS-URL: https://build.opensuse.org/request/show/847660 OBS-URL: https://build.opensuse.org/package/show/M17N/fcitx5?expand=0&rev=9 --- fcitx5-4.99.0+git20201015.dd9dc94.tar.xz | 3 - fcitx5-5.0.1.tar.xz | 3 + fcitx5.changes | 5 + fcitx5.spec | 131 +++++++++++------------ 4 files changed, 73 insertions(+), 69 deletions(-) delete mode 100644 fcitx5-4.99.0+git20201015.dd9dc94.tar.xz create mode 100644 fcitx5-5.0.1.tar.xz diff --git a/fcitx5-4.99.0+git20201015.dd9dc94.tar.xz b/fcitx5-4.99.0+git20201015.dd9dc94.tar.xz deleted file mode 100644 index a589580..0000000 --- a/fcitx5-4.99.0+git20201015.dd9dc94.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:24232f4b332390ce999d39d8f4bb344eb4ed5f96dd2e03044418aeb8138cdc1b -size 1258728 diff --git a/fcitx5-5.0.1.tar.xz b/fcitx5-5.0.1.tar.xz new file mode 100644 index 0000000..dd0241e --- /dev/null +++ b/fcitx5-5.0.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e3933b3c3bec5079bf2cd829c82dce2d3f0504784811068fb4b404c16fb4f24a +size 1266516 diff --git a/fcitx5.changes b/fcitx5.changes index 2d6c64d..fc75d56 100644 --- a/fcitx5.changes +++ b/fcitx5.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Nov 8 03:48:55 UTC 2020 - Marguerite Su + +- update version 5.0.1 + ------------------------------------------------------------------- Fri Oct 30 22:58:18 UTC 2020 - Xu Zhao diff --git a/fcitx5.spec b/fcitx5.spec index 73bb9b6..00d43b6 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -1,7 +1,7 @@ # # spec file for package fcitx5 # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,61 +12,56 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: fcitx5 -Version: 4.99.0+git20201015.dd9dc94 +Version: 5.0.1 Release: 0 Summary: Next generation of fcitx License: LGPL-2.1-or-later -Group: System/I18n/Chinese -Url: https://github.com/fcitx/fcitx5 -Source: %{name}-%{version}.tar.xz +Group: System/I18n/Chinese +URL: https://github.com/fcitx/fcitx5 +Source: https://download.fcitx-im.org/fcitx5/%{name}/%{name}-%{version}.tar.xz Source1: en_dict-20121020.tar.gz Source2: https://raw.githubusercontent.com/fcitx/fcitx-artwork/master/logo/Fcitx.svg Source3: xim.d-fcitx5 Source4: macros.fcitx5 Source99: baselibs.conf -Patch: fcitx5-no-download.patch +Patch0: fcitx5-no-download.patch # PATCH-FIX-UPSTREAM marguerite@opensuse.org fcitx5-std-runtime_error.patch - std::runtime_error is in stdexcept.h Patch1: fcitx5-std-runtime_error.patch +BuildRequires: Mesa-libEGL-devel +BuildRequires: cairo-devel BuildRequires: cldr-emoji-annotation-devel BuildRequires: cmake -BuildRequires: extra-cmake-modules -BuildRequires: gcc-c++ -BuildRequires: xcb-imdkit-devel -BuildRequires: libpresage-devel -BuildRequires: enchant-devel -BuildRequires: systemd-devel BuildRequires: dbus-1-devel -BuildRequires: libevent-devel -BuildRequires: libjson-c-devel -BuildRequires: libuuid-devel +BuildRequires: enchant-devel +BuildRequires: extra-cmake-modules +BuildRequires: fdupes BuildRequires: fmt-devel -BuildRequires: xcb-util-wm-devel -BuildRequires: xcb-util-keysyms-devel -BuildRequires: libxkbfile-devel +BuildRequires: gcc-c++ +BuildRequires: gdk-pixbuf-devel +BuildRequires: hicolor-icon-theme BuildRequires: iso-codes-devel +BuildRequires: libevent-devel BuildRequires: libexpat-devel -BuildRequires: xkeyboard-config +BuildRequires: libjson-c-devel +BuildRequires: libpresage-devel +BuildRequires: libuuid-devel BuildRequires: libxkbcommon-devel BuildRequires: libxkbcommon-x11-devel +BuildRequires: libxkbfile-devel +BuildRequires: pango-devel +BuildRequires: systemd-devel +BuildRequires: update-desktop-files BuildRequires: wayland-devel BuildRequires: wayland-protocols-devel -BuildRequires: Mesa-libEGL-devel -BuildRequires: pango-devel -BuildRequires: cairo-devel -BuildRequires: gdk-pixbuf-devel -BuildRequires: update-desktop-files -%if 0%{suse_version} >= 1550 || 0%{?sle_version} == 150200 && 0%{?is_opensuse} -BuildRequires: rsvg-convert -%else -BuildRequires: rsvg-view -%endif -BuildRequires: hicolor-icon-theme -BuildRequires: fdupes +BuildRequires: xcb-imdkit-devel +BuildRequires: xcb-util-keysyms-devel +BuildRequires: xcb-util-wm-devel +BuildRequires: xkeyboard-config Requires: libFcitx5Config6 = %{version} Requires: libFcitx5Core7 = %{version} Requires: libFcitx5Utils2 = %{version} @@ -76,66 +71,73 @@ Recommends: fcitx5-qt4 Recommends: fcitx5-qt5 Provides: fcitx = %{version} Obsoletes: fcitx < 4.99.0 -BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if 0%{?suse_version} >= 1550 || 0%{?sle_version} == 150200 && 0%{?is_opensuse} +BuildRequires: rsvg-convert +%else +BuildRequires: rsvg-view +%endif %description Fcitx 5 is a generic input method framework. %package devel -Summary: Development files for fcitx5 -Group: Development/Libraries/C and C++ -Requires: fcitx5 = %{version} +Summary: Development files for fcitx5 +Group: Development/Libraries/C and C++ +Requires: fcitx5 = %{version} %description devel This package provides development files for fcitx5. %package -n libFcitx5Config6 -Summary: Configuration library for fcitx5 -Group: System/Libraries -Provides: libFcitx5Core5 = %{version} -Obsoletes: libFcitx5Core5 < %{version} +Summary: Configuration library for fcitx5 +Group: System/Libraries +Provides: libFcitx5Core5 = %{version} +Obsoletes: libFcitx5Core5 < %{version} %description -n libFcitx5Config6 This package provides configuration libraries for fcitx5. %package -n libFcitx5Core7 -Summary: Core library for fcitx5 -Group: System/Libraries -Provides: libfcitx-4_2_9 = %{version} -Obsoletes: libfcitx-4_2_9 <= 4.2.9.6 -Provides: libFcitx5Core5 = %{version} -Obsoletes: libFcitx5Core5 < %{version} +Summary: Core library for fcitx5 +Group: System/Libraries +Provides: libfcitx-4_2_9 = %{version} +Obsoletes: libfcitx-4_2_9 <= 4.2.9.6 +Provides: libFcitx5Core5 = %{version} +Obsoletes: libFcitx5Core5 < %{version} %description -n libFcitx5Core7 This package provides core libraries for fcitx5. %package -n libFcitx5Utils2 -Summary: Utility library for fcitx5 -Group: System/Libraries -Provides: libFcitx5Utils1 = %{version} -Obsoletes: libFcitx5Utils1 < %{version} +Summary: Utility library for fcitx5 +Group: System/Libraries +Provides: libFcitx5Utils1 = %{version} +Obsoletes: libFcitx5Utils1 < %{version} %description -n libFcitx5Utils2 This package provides utility libraries for fcitx5. %prep %setup -q -%patch -p1 +%patch0 -p1 #%patch1 -p1 -cp -r %{S:1} src/modules/spell/dict/ +cp -r %{SOURCE1} src/modules/spell/dict/ # fix fcitx5-diagnose env-script-interpreter sed -i '1s/env //' data/fcitx5-diagnose.sh %build -%cmake -DENABLE_PRESAGE=On -DCMAKE_SKIP_RPATH=OFF -make %{?_smp_mflags} +%cmake -DENABLE_PRESAGE=On -DCMAKE_SKIP_RPATH=OFF -DCMAKE_INSTALL_SYSCONFDIR=%{_sysconfdir} +%make_build %install %cmake_install +# recreate soft link +rm -rf %{buildroot}%{_sysconfdir}/xdg/autostart/org.fcitx.Fcitx5.desktop +ln -sf %{_datadir}/applications/org.fcitx.Fcitx5.desktop %{buildroot}%{_sysconfdir}/xdg/autostart/ # create autostart mkdir -p %{buildroot}%{_sysconfdir}/X11/xim.d/ -install -m 644 %{S:3} %{buildroot}%{_sysconfdir}/X11/xim.d/fcitx +install -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/X11/xim.d/fcitx priority=30 pushd %{buildroot}%{_sysconfdir}/X11/xim.d/ @@ -152,12 +154,12 @@ popd # install icons for i in 16 22 24 32 48 512; do mkdir -p %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps/ - rsvg-convert -h $i -w $i %{S:2} -o %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps/fcitx.png + rsvg-convert -h $i -w $i %{SOURCE2} -o %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps/fcitx.png done -install -D -m 0644 %{S:2} %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/fcitx.svg +install -D -m 0644 %{SOURCE2} %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/fcitx.svg # install desktop files -%suse_update_desktop_file fcitx5 Utility DesktopUtility +%suse_update_desktop_file %{buildroot}%{_datadir}/applications/org.fcitx.Fcitx5.desktop Utility DesktopUtility %suse_update_desktop_file -r fcitx5-configtool System X-SuSE-SystemSetup # own directories @@ -165,7 +167,7 @@ mkdir -p %{buildroot}%{_datadir}/fcitx5/inputmethod mkdir -p %{buildroot}%{_libdir}/fcitx5/qt5 # install macros.fcitx5 -install -Dm 0755 %{S:4} %{buildroot}%{_sysconfdir}/rpm/macros.fcitx5 +install -Dm 0755 %{SOURCE4} %{buildroot}%{_sysconfdir}/rpm/macros.fcitx5 %find_lang fcitx5 %fdupes %{buildroot} @@ -180,22 +182,23 @@ install -Dm 0755 %{S:4} %{buildroot}%{_sysconfdir}/rpm/macros.fcitx5 %postun -n libFcitx5Utils2 -p /sbin/ldconfig %files -f fcitx5.lang -%defattr(-,root,root) %doc README.md %license LICENSES %config %{_sysconfdir}/X11/xim.d/ +%{_sysconfdir}/xdg/autostart/org.fcitx.Fcitx5.desktop %{_bindir}/fcitx5 %{_bindir}/fcitx5-configtool %{_bindir}/fcitx5-remote %{_bindir}/fcitx5-diagnose %{_libdir}/fcitx5 -%{_datadir}/applications/fcitx5.desktop +%{_datadir}/applications/org.fcitx.Fcitx5.desktop %{_datadir}/applications/fcitx5-configtool.desktop %{_datadir}/fcitx5 %{_datadir}/icons/hicolor/*/apps/fcitx.* +%{_datadir}/dbus-1/services/org.fcitx.Fcitx5.service +%{_datadir}/metainfo/org.fcitx.Fcitx5.metainfo.xml %files devel -%defattr(-,root,root) %{_sysconfdir}/rpm/macros.fcitx5 %{_includedir}/Fcitx5 %{_libdir}/cmake/Fcitx5* @@ -205,19 +208,15 @@ install -Dm 0755 %{S:4} %{buildroot}%{_sysconfdir}/rpm/macros.fcitx5 %{_libdir}/pkgconfig/Fcitx5*.pc %files -n libFcitx5Config6 -%defattr(-,root,root) %{_libdir}/libFcitx5Config.so.6 %{_libdir}/libFcitx5Config.so.5.0 %files -n libFcitx5Core7 -%defattr(-,root,root) %{_libdir}/libFcitx5Core.so.7 %{_libdir}/libFcitx5Core.so.5.0 %files -n libFcitx5Utils2 -%defattr(-,root,root) %{_libdir}/libFcitx5Utils.so.2 %{_libdir}/libFcitx5Utils.so.5.0 %changelog -