From b047827fe30ff91534a65adf0dda8add9dd70e300df42f6c9fa3da578aca43c4 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Thu, 28 Oct 2021 14:16:21 +0000 Subject: [PATCH] Accepting request 927979 from home:tiwai:branches:M17N - Fix build with Leap 15.3 and 15.4 due to rsvg pkg conflicts OBS-URL: https://build.opensuse.org/request/show/927979 OBS-URL: https://build.opensuse.org/package/show/M17N/fcitx5?expand=0&rev=16 --- fcitx5.changes | 5 +++++ fcitx5.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/fcitx5.changes b/fcitx5.changes index 24525f0..e61d3b4 100644 --- a/fcitx5.changes +++ b/fcitx5.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Oct 28 16:09:32 CEST 2021 - tiwai@suse.de + +- Fix build with Leap 15.3 and 15.4 due to rsvg pkg conflicts + ------------------------------------------------------------------- Wed May 5 06:57:39 UTC 2021 - Marguerite Su diff --git a/fcitx5.spec b/fcitx5.spec index 43131a8..c1f8a47 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -80,7 +80,7 @@ Recommends: fcitx5-qt4 Recommends: fcitx5-qt5 Provides: fcitx = %{version} Obsoletes: fcitx <= 4.2.9.8 -%if 0%{?suse_version} >= 1550 || 0%{?sle_version} == 150200 && 0%{?is_opensuse} +%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150200 && 0%{?is_opensuse} BuildRequires: rsvg-convert %else BuildRequires: rsvg-view