From b60b6573c5a9b3eb5f4d534ffe201205579c4373 Mon Sep 17 00:00:00 2001
From: Greg Lin <glin@rstudio.com>
Date: Tue, 28 Dec 2021 12:17:35 -0600
Subject: [PATCH] Fix openSUSE 15.3 installation and update to ICU 69

openSUSE/SLES 15.3 originally shipped with ICU 65 (libicu-devel), but later
added ICU 69 (icu.691-devel) in a patch update. Prefer ICU 69 because the devel
packages can't coexist, and zypper now resolves libicu-devel to icu.691-devel.

https://lists.suse.com/pipermail/sle-security-updates/2021-December/009908.html
---
 builder/Dockerfile.opensuse-153 | 5 ++++-
 builder/package.opensuse-153    | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/builder/Dockerfile.opensuse-153 b/builder/Dockerfile.opensuse-153
index a0734c2..83b1372 100644
--- a/builder/Dockerfile.opensuse-153
+++ b/builder/Dockerfile.opensuse-153
@@ -17,6 +17,10 @@ RUN zypper --non-interactive --gpg-auto-import-keys -n install \
     glib2-devel \
     glibc-locale \
     help2man \
+    # openSUSE/SLES 15.3 originally shipped with ICU 65 (libicu-devel), but later
+    # added ICU 69 (icu.691-devel) in a patch update. Prefer ICU 69 because the devel
+    # packages can't coexist, and zypper now resolves libicu-devel to icu.691-devel.
+    icu.691-devel \
     java-1_8_0-openjdk-devel \
     libX11-devel \
     libXScrnSaver-devel \
@@ -24,7 +28,6 @@ RUN zypper --non-interactive --gpg-auto-import-keys -n install \
     libXt-devel \
     libbz2-devel \
     libcurl-devel \
-    libicu-devel \
     libjpeg-devel \
     libpng-devel \
     libtiff-devel \
diff --git a/builder/package.opensuse-153 b/builder/package.opensuse-153
index 1999d51..fe1a3dc 100644
--- a/builder/package.opensuse-153
+++ b/builder/package.opensuse-153
@@ -44,12 +44,12 @@ fpm \
   -d gcc-fortran \
   -d glibc-locale \
   -d gzip \
+  -d icu.691-devel \
   -d libbz2-devel \
   -d libcairo2 \
   -d libcurl-devel \
   -d libfreetype6 \
   -d libgomp1 \
-  -d libicu-devel \
   -d libjpeg62 \
   -d libpango-1_0-0 \
   -d libreadline7 \