From 3bfa1db39d925a94507149a17b85494c2487bd2c06593c9cdace8c15d0f12137 Mon Sep 17 00:00:00 2001
From: Marguerite Su <i@marguerite.su>
Date: Sun, 31 Jan 2021 06:29:11 +0000
Subject: [PATCH] Accepting request 868076 from home:MargueriteSu:branches:M17N

- update version 5.0.4
  * Supporting resolving the session dbus address exported to X11
  * Add long press support for special symbol, this is disabled by default and also customizable.
  * Avoid trigger dbus activation for "fcitx5-remote -e"
  * In order to support "old" fcitx im module bundled, added a new fcitx4 frontend (mainly to support wps-office out of box).

OBS-URL: https://build.opensuse.org/request/show/868076
OBS-URL: https://build.opensuse.org/package/show/M17N/fcitx5?expand=0&rev=13
---
 baselibs.conf       |  2 +-
 fcitx5-5.0.3.tar.xz |  3 ---
 fcitx5-5.0.4.tar.xz |  3 +++
 fcitx5.changes      |  9 +++++++++
 fcitx5.spec         | 14 ++++++++------
 5 files changed, 21 insertions(+), 10 deletions(-)
 delete mode 100644 fcitx5-5.0.3.tar.xz
 create mode 100644 fcitx5-5.0.4.tar.xz

diff --git a/baselibs.conf b/baselibs.conf
index 34437dd..ec2597b 100644
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -7,7 +7,7 @@ libFcitx5Core7
     requires "libuuid1-<targettype>"
     requires "libxkbcommon0-<targettype>"
     provides "libfcitx-4_2_9-<targettype> = <version>"
-    obsoletes "libfcitx-4_2_9-<targettype> <= 4.2.9.6"
+    obsoletes "libfcitx-4_2_9-<targettype> <= 4.2.9.8"
     provides "libFcitx5Core5-<targettype> = <version>"
     obsoletes "libFcitx5Core5-<targettype> < <version>"
     post "/sbin/ldconfig"
diff --git a/fcitx5-5.0.3.tar.xz b/fcitx5-5.0.3.tar.xz
deleted file mode 100644
index 258232d..0000000
--- a/fcitx5-5.0.3.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:06400e643bea6409f840182d47f229d04adf055e43cb53973c5fff92732890e6
-size 1281544
diff --git a/fcitx5-5.0.4.tar.xz b/fcitx5-5.0.4.tar.xz
new file mode 100644
index 0000000..0494762
--- /dev/null
+++ b/fcitx5-5.0.4.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:191a14e97c0d4281e4ef68c29c8aa216ae23ba5a0f80c8ad896c93c5f1311185
+size 1291856
diff --git a/fcitx5.changes b/fcitx5.changes
index 3422ac7..25be547 100644
--- a/fcitx5.changes
+++ b/fcitx5.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Sat Jan 30 09:39:06 UTC 2021 - Marguerite Su <i@marguerite.su>
+
+- update version 5.0.4
+  * Supporting resolving the session dbus address exported to X11
+  * Add long press support for special symbol, this is disabled by default and also customizable.
+  * Avoid trigger dbus activation for "fcitx5-remote -e"
+  * In order to support "old" fcitx im module bundled, added a new fcitx4 frontend (mainly to support wps-office out of box).
+
 -------------------------------------------------------------------
 Fri Dec 11 06:49:22 UTC 2020 - Marguerite Su <i@marguerite.su>
 
diff --git a/fcitx5.spec b/fcitx5.spec
index 00f772b..a0643a1 100644
--- a/fcitx5.spec
+++ b/fcitx5.spec
@@ -20,7 +20,7 @@
 %endif
 
 Name:           fcitx5
-Version:        5.0.3
+Version:        5.0.4
 Release:        0
 Summary:        Next generation of fcitx
 License:        LGPL-2.1-or-later
@@ -75,7 +75,7 @@ Recommends:     fcitx5-gtk3
 Recommends:     fcitx5-qt4
 Recommends:     fcitx5-qt5
 Provides:       fcitx = %{version}
-Obsoletes:      fcitx < 4.99.0
+Obsoletes:      fcitx <= 4.2.9.8
 %if 0%{?suse_version} >= 1550 || 0%{?sle_version} == 150200 && 0%{?is_opensuse}
 BuildRequires:  rsvg-convert
 %else
@@ -89,6 +89,8 @@ Fcitx 5 is a generic input method framework.
 Summary:        Development files for fcitx5
 Group:          Development/Libraries/C and C++
 Requires:       fcitx5 = %{version}
+Provides:       fcitx-devel = %{version}
+Obsoletes:      fcitx-devel <= 4.2.9.8
 
 %description devel
 This package provides development files for fcitx5.
@@ -106,7 +108,7 @@ This package provides configuration libraries for fcitx5.
 Summary:        Core library for fcitx5
 Group:          System/Libraries
 Provides:       libfcitx-4_2_9 = %{version}
-Obsoletes:      libfcitx-4_2_9 <= 4.2.9.6
+Obsoletes:      libfcitx-4_2_9 <= 4.2.9.8
 Provides:       libFcitx5Core5 = %{version}
 Obsoletes:      libFcitx5Core5 < %{version}
 
@@ -213,14 +215,14 @@ install -Dm 0755 %{SOURCE4} %{buildroot}%{_sysconfdir}/rpm/macros.fcitx5
 
 %files -n libFcitx5Config6
 %{_libdir}/libFcitx5Config.so.6
-%{_libdir}/libFcitx5Config.so.5.0.3
+%{_libdir}/libFcitx5Config.so.%{version}
 
 %files -n libFcitx5Core7
 %{_libdir}/libFcitx5Core.so.7
-%{_libdir}/libFcitx5Core.so.5.0.3
+%{_libdir}/libFcitx5Core.so.%{version}
 
 %files -n libFcitx5Utils2
 %{_libdir}/libFcitx5Utils.so.2
-%{_libdir}/libFcitx5Utils.so.5.0.3
+%{_libdir}/libFcitx5Utils.so.%{version}
 
 %changelog