From 399ef6d5b37a2f55474db6ca2fc77074406fd2f9c9e6561da2ab27c4affbc0db Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 25 Apr 2022 14:37:51 +0000 Subject: [PATCH] add conflict markers; drop pre-12 parts OBS-URL: https://build.opensuse.org/package/show/X11:common:Factory/icu?expand=0&rev=158 --- baselibs.conf | 1 + icu.spec | 7 +++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/baselibs.conf b/baselibs.conf index d988440..e39ed5b 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,4 +1,5 @@ libicu71 + conflicts "libicu70- = 71.1" libicu-devel requires -libicu- requires "libicu71- = " diff --git a/icu.spec b/icu.spec index 393a121..0023ff1 100644 --- a/icu.spec +++ b/icu.spec @@ -64,6 +64,9 @@ This subpackage contains the runtime programs for interacting with ICU. Summary: International Components for Unicode Group: System/Libraries Requires: timezone +%if "%lname" == "libicu71" +Conflicts: libicu70 = 71.1 +%endif Provides: libicu = %version %if %be_platform Requires: libicu%aversion-bedata = %version @@ -79,9 +82,7 @@ This package contains the runtime libraries for ICU. %package -n libicu%aversion-bedata Summary: Rule databases and tables for ICU Group: System/Libraries -%if 0%{?suse_version} >= 1210 BuildArch: noarch -%endif %description -n libicu%aversion-bedata ICU is a set of C and C++ libraries that provide extensive Unicode @@ -96,9 +97,7 @@ This subpackage contains these data tables, in big-endian format. %package -n libicu%aversion-ledata Summary: Rule databases and tables for ICU Group: System/Libraries -%if 0%{?suse_version} >= 1210 BuildArch: noarch -%endif %description -n libicu%aversion-ledata ICU is a set of C and C++ libraries that provide extensive Unicode