From 92c41f2a3c1969b4a147cfe988249b25075d84d123a01b0e07f304dab4613949 Mon Sep 17 00:00:00 2001 From: Marguerite Su Date: Sat, 5 Sep 2020 09:23:15 +0000 Subject: [PATCH] Accepting request 832449 from home:MargueriteSu:branches:M17N - update to 4.99.0+git20200902.a87f7b0 OBS-URL: https://build.opensuse.org/request/show/832449 OBS-URL: https://build.opensuse.org/package/show/M17N/fcitx5?expand=0&rev=6 --- baselibs.conf | 18 +++++--- fcitx5-4.99.0+git20200212.9436416.tar.xz | 3 -- fcitx5-4.99.0+git20200902.a87f7b0.tar.xz | 3 ++ fcitx5.changes | 5 ++ fcitx5.spec | 59 +++++++++++++----------- 5 files changed, 53 insertions(+), 35 deletions(-) delete mode 100644 fcitx5-4.99.0+git20200212.9436416.tar.xz create mode 100644 fcitx5-4.99.0+git20200902.a87f7b0.tar.xz diff --git a/baselibs.conf b/baselibs.conf index b477fea..5c9bfc0 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,6 +1,6 @@ -libFcitx5Core5 - requires "libFcitx5Config5- = " - requires "libFcitx5Utils1- = " +libFcitx5Core6 + requires "libFcitx5Config6- = " + requires "libFcitx5Utils2- = " requires "libgcc_s1-" requires "glibc-" requires "libstdc++6-" @@ -8,19 +8,25 @@ libFcitx5Core5 requires "libxkbcommon0-" provides "libfcitx-4_2_9- = " obsoletes "libfcitx-4_2_9- <= 4.2.9.6" + provides "libFcitx5Core5- = " + obsoletes "libFcitx5Core5- < " post "/sbin/ldconfig" postun "/sbin/ldconfig" -libFcitx5Config5 - requires "libFcitx5Utils1- = " +libFcitx5Config6 + requires "libFcitx5Utils2- = " requires "glibc-" requires "libgcc_s1-" requires "libstdc++6-" + provides "libFcitx5Config5- = " + obsoletes "libFcitx5Config5- < " post "/sbin/ldconfig" postun "/sbin/ldconfig" -libFcitx5Utils1 +libFcitx5Utils2 requires "glibc-" requires "libstdc++6-" requires "libgcc_s1-" requires "libsystemd0-" + provides "libFcitx5Utils1- = " + obsoletes "libFcitx5Utils1- < " post "/sbin/ldconfig" postun "/sbin/ldconfig" diff --git a/fcitx5-4.99.0+git20200212.9436416.tar.xz b/fcitx5-4.99.0+git20200212.9436416.tar.xz deleted file mode 100644 index d897c79..0000000 --- a/fcitx5-4.99.0+git20200212.9436416.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b4cd000ba7c879e6ca1891a7ec97ea37f7607692c5b178b535da5a8baf63d987 -size 1170144 diff --git a/fcitx5-4.99.0+git20200902.a87f7b0.tar.xz b/fcitx5-4.99.0+git20200902.a87f7b0.tar.xz new file mode 100644 index 0000000..1a17caa --- /dev/null +++ b/fcitx5-4.99.0+git20200902.a87f7b0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d1cb5418bb246d12fe18f8b5265b1fbf4a8672aa9c3b28b52e24cca004bd3bcb +size 6184284 diff --git a/fcitx5.changes b/fcitx5.changes index 486da10..1a49b48 100644 --- a/fcitx5.changes +++ b/fcitx5.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Sep 3 05:46:46 UTC 2020 - Marguerite Su + +- update to 4.99.0+git20200902.a87f7b0 + ------------------------------------------------------------------- Wed Sep 2 04:48:40 UTC 2020 - Marguerite Su diff --git a/fcitx5.spec b/fcitx5.spec index 8f0b8ac..155fd25 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -17,12 +17,12 @@ Name: fcitx5 -Version: 4.99.0+git20200212.9436416 +Version: 4.99.0+git20200902.a87f7b0 Release: 0 Summary: Next generation of fcitx License: LGPL-2.1-or-later Group: System/I18n/Chinese -Url: https://gitlab.com/fcitx/fcitx5 +Url: https://github.com/fcitx/fcitx5 Source: %{name}-%{version}.tar.xz Source1: en_dict-20121020.tar.gz Source2: https://raw.githubusercontent.com/fcitx/fcitx-artwork/master/logo/Fcitx.svg @@ -67,9 +67,9 @@ BuildRequires: rsvg-view %endif BuildRequires: hicolor-icon-theme BuildRequires: fdupes -Requires: libFcitx5Config5 = %{version} -Requires: libFcitx5Core5 = %{version} -Requires: libFcitx5Utils1 = %{version} +Requires: libFcitx5Config6 = %{version} +Requires: libFcitx5Core6 = %{version} +Requires: libFcitx5Utils2 = %{version} Recommends: fcitx5-gtk2 Recommends: fcitx5-gtk3 Recommends: fcitx5-qt4 @@ -89,33 +89,39 @@ Requires: fcitx5 = %{version} %description devel This package provides development files for fcitx5. -%package -n libFcitx5Config5 +%package -n libFcitx5Config6 Summary: Configuration library for fcitx5 Group: System/Libraries +Provides: libFcitx5Core5 = %{version} +Obsoletes: libFcitx5Core5 < %{version} -%description -n libFcitx5Config5 +%description -n libFcitx5Config6 This package provides configuration libraries for fcitx5. -%package -n libFcitx5Core5 +%package -n libFcitx5Core6 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 libFcitx5Core5 +%description -n libFcitx5Core6 This package provides core libraries for fcitx5. -%package -n libFcitx5Utils1 +%package -n libFcitx5Utils2 Summary: Utility library for fcitx5 Group: System/Libraries +Provides: libFcitx5Utils1 = %{version} +Obsoletes: libFcitx5Utils1 < %{version} -%description -n libFcitx5Utils1 +%description -n libFcitx5Utils2 This package provides utility libraries for fcitx5. %prep %setup -q %patch -p1 -%patch1 -p1 +#%patch1 -p1 cp -r %{S:1} src/modules/spell/dict/ %build @@ -163,17 +169,18 @@ install -Dm 0755 %{S:4} %{buildroot}%{_sysconfdir}/rpm/macros.fcitx5 %fdupes %{buildroot} %post -p /sbin/ldconfig -%post -n libFcitx5Config5 -p /sbin/ldconfig -%post -n libFcitx5Core5 -p /sbin/ldconfig -%post -n libFcitx5Utils1 -p /sbin/ldconfig +%post -n libFcitx5Config6 -p /sbin/ldconfig +%post -n libFcitx5Core6 -p /sbin/ldconfig +%post -n libFcitx5Utils2 -p /sbin/ldconfig %postun -p /sbin/ldconfig -%postun -n libFcitx5Config5 -p /sbin/ldconfig -%postun -n libFcitx5Core5 -p /sbin/ldconfig -%postun -n libFcitx5Utils1 -p /sbin/ldconfig +%postun -n libFcitx5Config6 -p /sbin/ldconfig +%postun -n libFcitx5Core6 -p /sbin/ldconfig +%postun -n libFcitx5Utils2 -p /sbin/ldconfig %files -f fcitx5.lang %defattr(-,root,root) -%doc README.md COPYING +%doc README.md +%license LICENSES %config %{_sysconfdir}/X11/xim.d/ %{_bindir}/fcitx5 %{_bindir}/fcitx5-configtool @@ -194,20 +201,20 @@ install -Dm 0755 %{S:4} %{buildroot}%{_sysconfdir}/rpm/macros.fcitx5 %{_libdir}/libFcitx5Utils.so %{_libdir}/pkgconfig/Fcitx5*.pc -%files -n libFcitx5Config5 +%files -n libFcitx5Config6 %defattr(-,root,root) -%{_libdir}/libFcitx5Config.so.5 +%{_libdir}/libFcitx5Config.so.6 %{_libdir}/libFcitx5Config.so.5.0 -%files -n libFcitx5Core5 +%files -n libFcitx5Core6 %defattr(-,root,root) -%{_libdir}/libFcitx5Core.so.5 +%{_libdir}/libFcitx5Core.so.6 %{_libdir}/libFcitx5Core.so.5.0 -%files -n libFcitx5Utils1 +%files -n libFcitx5Utils2 %defattr(-,root,root) -%{_libdir}/libFcitx5Utils.so.1 -%{_libdir}/libFcitx5Utils.so.1.0 +%{_libdir}/libFcitx5Utils.so.2 +%{_libdir}/libFcitx5Utils.so.5.0 %changelog