From 934ec395a3256d4c2e5eba425155d09a8c733350060a93cbcecd1b5c1394ca60 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 24 Jan 2024 08:16:54 +0000 Subject: [PATCH 1/3] OBS-URL: https://build.opensuse.org/package/show/Java:Factory/java-21-openjdk?expand=0&rev=28 --- java-21-openjdk.changes | 5 +++++ java-21-openjdk.spec | 12 ++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/java-21-openjdk.changes b/java-21-openjdk.changes index 4446081..720f195 100644 --- a/java-21-openjdk.changes +++ b/java-21-openjdk.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 24 08:16:42 UTC 2024 - Fridrich Strba + +- Add JPackage base provides for SLE15 too (bsc#1219115) + ------------------------------------------------------------------- Wed Jan 17 13:18:39 UTC 2024 - Fridrich Strba diff --git a/java-21-openjdk.spec b/java-21-openjdk.spec index efddcc0..ac0fb2b 100644 --- a/java-21-openjdk.spec +++ b/java-21-openjdk.spec @@ -1,5 +1,5 @@ # -# spec file +# spec file for package java-21-openjdk # # Copyright (c) 2024 SUSE LLC # @@ -210,7 +210,7 @@ BuildRequires: zip Requires: %{name}-headless = %{version}-%{release} Requires: fontconfig Requires(post): file -%if 0%{?suse_version} > 1500 || 0%{?java_bootstrap} +%if 0%{?suse_version} >= 1500 || 0%{?java_bootstrap} # Standard JPackage base provides. Provides: java = %{javaver} Provides: java-%{javaver} = %{version}-%{release} @@ -279,9 +279,9 @@ Requires: jpackage-utils Requires: mozilla-nss # Post requires update-alternatives to install tool update-alternatives. Requires(post): update-alternatives -Requires(posttrans):java-ca-certificates +Requires(posttrans): java-ca-certificates # Postun requires update-alternatives to uninstall tool update-alternatives. -Requires(postun):update-alternatives +Requires(postun): update-alternatives Recommends: tzdata-java8 Obsoletes: %{name}-accessibility %if 0%{?suse_version} > 1500 || 0%{?java_bootstrap} @@ -317,7 +317,7 @@ Requires: %{name} = %{version}-%{release} # Post requires update-alternatives to install tool update-alternatives. Requires(post): update-alternatives # Postun requires update-alternatives to uninstall tool update-alternatives. -Requires(postun):update-alternatives +Requires(postun): update-alternatives %if 0%{?suse_version} > 1500 || 0%{?java_bootstrap} # Standard JPackage devel provides. Provides: java-%{javaver}-devel = %{version} @@ -363,7 +363,7 @@ Requires: jpackage-utils # Post requires update-alternatives to install javadoc alternative. Requires(post): update-alternatives # Postun requires update-alternatives to uninstall javadoc alternative. -Requires(postun):update-alternatives +Requires(postun): update-alternatives BuildArch: noarch %if 0%{?suse_version} > 1500 || 0%{?java_bootstrap} # Standard JPackage javadoc provides. From 939ed93f24401cbb4e4d577fd3008472056771264fdd890729554c5c16deb7f3 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 24 Jan 2024 08:19:18 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/Java:Factory/java-21-openjdk?expand=0&rev=29 --- java-21-openjdk.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-21-openjdk.spec b/java-21-openjdk.spec index ac0fb2b..f71913d 100644 --- a/java-21-openjdk.spec +++ b/java-21-openjdk.spec @@ -210,7 +210,7 @@ BuildRequires: zip Requires: %{name}-headless = %{version}-%{release} Requires: fontconfig Requires(post): file -%if 0%{?suse_version} >= 1500 || 0%{?java_bootstrap} +%if 0%{?suse_version} > 1315 || 0%{?java_bootstrap} # Standard JPackage base provides. Provides: java = %{javaver} Provides: java-%{javaver} = %{version}-%{release} From 1e42e311e6ef82debd5070c6cdd8ba0d1c4f4d34ef5ca5687b2094fbebdaefbf Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 24 Jan 2024 08:28:35 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/Java:Factory/java-21-openjdk?expand=0&rev=30 --- java-21-openjdk.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/java-21-openjdk.spec b/java-21-openjdk.spec index f71913d..c47832f 100644 --- a/java-21-openjdk.spec +++ b/java-21-openjdk.spec @@ -284,7 +284,7 @@ Requires(posttrans): java-ca-certificates Requires(postun): update-alternatives Recommends: tzdata-java8 Obsoletes: %{name}-accessibility -%if 0%{?suse_version} > 1500 || 0%{?java_bootstrap} +%if 0%{?suse_version} > 1315 || 0%{?java_bootstrap} # Standard JPackage base provides. Provides: java-%{javaver}-headless = %{version}-%{release} Provides: java-headless = %{javaver} @@ -318,7 +318,7 @@ Requires: %{name} = %{version}-%{release} Requires(post): update-alternatives # Postun requires update-alternatives to uninstall tool update-alternatives. Requires(postun): update-alternatives -%if 0%{?suse_version} > 1500 || 0%{?java_bootstrap} +%if 0%{?suse_version} > 1315 || 0%{?java_bootstrap} # Standard JPackage devel provides. Provides: java-%{javaver}-devel = %{version} Provides: java-devel = %{javaver} @@ -365,7 +365,7 @@ Requires(post): update-alternatives # Postun requires update-alternatives to uninstall javadoc alternative. Requires(postun): update-alternatives BuildArch: noarch -%if 0%{?suse_version} > 1500 || 0%{?java_bootstrap} +%if 0%{?suse_version} > 1315 || 0%{?java_bootstrap} # Standard JPackage javadoc provides. Provides: java-%{javaver}-javadoc = %{version}-%{release} Provides: java-javadoc = %{version}-%{release}