From f43f0b53ba289ca3284ef83aed6c6939585dee61ea7bb34e07faa636453f1d47 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Mon, 25 Apr 2022 14:27:01 +0000
Subject: [PATCH 1/2] Accepting request 972640 from
 home:darix:branches:X11:common:Factory

- bump library packagename to libicu71 to match the version.

OBS-URL: https://build.opensuse.org/request/show/972640
OBS-URL: https://build.opensuse.org/package/show/X11:common:Factory/icu?expand=0&rev=157
---
 baselibs.conf | 4 ++--
 icu.changes   | 5 +++++
 icu.spec      | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/baselibs.conf b/baselibs.conf
index 43d285e..d988440 100644
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -1,4 +1,4 @@
-libicu70
+libicu71
 libicu-devel
 	requires -libicu-<targettype>
-	requires "libicu70-<targettype> = <version>"
+	requires "libicu71-<targettype> = <version>"
diff --git a/icu.changes b/icu.changes
index 3c12e20..adcca7b 100644
--- a/icu.changes
+++ b/icu.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Apr 25 14:21:31 UTC 2022 - Marcus Rueckert <mrueckert@suse.de>
+
+- bump library packagename to libicu71 to match the version.
+
 -------------------------------------------------------------------
 Sat Apr  9 22:10:56 UTC 2022 - Dirk Müller <dmueller@suse.com>
 
diff --git a/icu.spec b/icu.spec
index 2236c83..393a121 100644
--- a/icu.spec
+++ b/icu.spec
@@ -16,7 +16,7 @@
 #
 
 
-%define lname	libicu70
+%define lname	libicu71
 %define amajor   71
 %define aversion 71
 %ifarch %armb hppa mips mips64 ppc ppc64 %sparc s390 s390x m68k

From 399ef6d5b37a2f55474db6ca2fc77074406fd2f9c9e6561da2ab27c4affbc0db Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Mon, 25 Apr 2022 14:37:51 +0000
Subject: [PATCH 2/2] 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-<targettype> = 71.1"
 libicu-devel
 	requires -libicu-<targettype>
 	requires "libicu71-<targettype> = <version>"
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