summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--remi-release.spec29
1 files changed, 19 insertions, 10 deletions
diff --git a/remi-release.spec b/remi-release.spec
index dde74fd..e7876f3 100644
--- a/remi-release.spec
+++ b/remi-release.spec
@@ -11,13 +11,13 @@
Name: remi-release
Version: %{fedora}
%if %{fedora} == 39
-Release: 1%{?dist}
+Release: 2%{?dist}
%endif
%if %{fedora} == 38
-Release: 2%{?dist}
+Release: 3%{?dist}
%endif
%if %{fedora} == 37
-Release: 2%{?dist}
+Release: 3%{?dist}
%endif
Summary: Configuration for remi repository
Summary(fr): Configuration pour le dépôt remi
@@ -49,19 +49,24 @@ Requires: /etc/yum.repos.d
Requires: fedora-release >= %{fedora}
# For smoth upgrade
-%if %{fedora} >= 39
-Obsoletes: icu73 < 73.2
-Obsoletes: libicu73 < 73.2
-Obsoletes: libicu73-devel < 73.2
-Obsoletes: libicu73-doc < 73.2
+%if %{fedora} == 39
+# F39 have ICU 73.2-2
+Obsoletes: icu73 < 73.3
+Obsoletes: libicu73 < 73.3
+Obsoletes: libicu73-devel < 73.3
+Obsoletes: libicu73-doc < 73.3
%endif
-%if %{fedora} >= 38
+%if %{fedora} == 38
+# Only F38 have ICU 72.1-2
+# libicu72: remi has 72.1-1, F39+ has 72.1-2
Obsoletes: icu72 < 72.2
Obsoletes: libicu72 < 72.2
Obsoletes: libicu72-devel < 72.2
Obsoletes: libicu72-doc < 72.2
%endif
-%if %{fedora} >= 37
+%if %{fedora} == 37
+# Only F37 have ICU 71.1-2
+# libicu71: remi has 71.1-2, F38+ has 71.1-2
Obsoletes: icu71 < 71.2
Obsoletes: libicu71 < 71.2
Obsoletes: libicu71-devel < 71.2
@@ -145,6 +150,10 @@ mkdir -p %{buildroot}/opt/remi
%changelog
+* Mon Oct 30 2023 Remi Collet <remi@remirepo.net> - 39-2, 38-3, 37-3
+- only obsolete libicu compat package when it matches system version
+ libicu71 on F37, libicu72 on F38, libicu73 on F39
+
* Mon Aug 21 2023 Remi Collet <remi@remirepo.net> - 39-1
- Fedora 39 using 2023 GPG key