From f30f926d54f0f3d26d1e6d7ede3c089d65f57ea9 Mon Sep 17 00:00:00 2001 From: Sergey Zhemoytel Date: Sun, 31 Mar 2024 20:47:04 +0000 Subject: [PATCH] New --- java-17-openjdk.spec | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/java-17-openjdk.spec b/java-17-openjdk.spec index ddfd033..efc6653 100644 --- a/java-17-openjdk.spec +++ b/java-17-openjdk.spec @@ -1125,7 +1125,7 @@ Requires: xorg-x11-fonts-Type1 Requires: libXcomposite%{?_isa} # Requires rest of java Requires: %{name}-headless%{?1}%{?_isa} = %{epoch}:%{version}-%{release} -OrderWithRequires: %{name}-headless%{?1}%{?_isa} = %{epoch}:%{version}-%{release} +#OrderWithRequires: %{name}-headless%{?1}%{?_isa} = %{epoch}:%{version}-%{release} # for java-X-openjdk package's desktop binding # Where recommendations are available, recommend Gtk+ for the Swing look and feel Recommends: gtk3%{?_isa} @@ -1161,7 +1161,7 @@ Requires: lksctp-tools%{?_isa} # not rpm transaction and so no configs are persisted when pure rpm -u is run. It may be # considered as regression Requires: copy-jdk-configs >= 4.0 -OrderWithRequires: copy-jdk-configs +#OrderWithRequires: copy-jdk-configs %endif # for printing support Requires: cups-libs @@ -1191,7 +1191,7 @@ Provides: java-headless%{?1} = %{epoch}:%{version}-%{release} %define java_devel_rpo() %{expand: # Requires base package Requires: %{name}%{?1}%{?_isa} = %{epoch}:%{version}-%{release} -OrderWithRequires: %{name}-headless%{?1}%{?_isa} = %{epoch}:%{version}-%{release} +#OrderWithRequires: %{name}-headless%{?1}%{?_isa} = %{epoch}:%{version}-%{release} # Post requires alternatives to install tool alternatives Requires(post): %{alternatives_requires} # Postun requires alternatives to uninstall tool alternatives @@ -1212,14 +1212,14 @@ Provides: java-sdk%{?1} = %{epoch}:%{version}-%{release} %define java_static_libs_rpo() %{expand: Requires: %{name}-devel%{?1}%{?_isa} = %{epoch}:%{version}-%{release} -OrderWithRequires: %{name}-headless%{?1}%{?_isa} = %{epoch}:%{version}-%{release} +#OrderWithRequires: %{name}-headless%{?1}%{?_isa} = %{epoch}:%{version}-%{release} } %define java_jmods_rpo() %{expand: # Requires devel package # as jmods are bytecode, they should be OK without any _isa Requires: %{name}-devel%{?1} = %{epoch}:%{version}-%{release} -OrderWithRequires: %{name}-headless%{?1} = %{epoch}:%{version}-%{release} +#OrderWithRequires: %{name}-headless%{?1} = %{epoch}:%{version}-%{release} Provides: java-%{javaver}-jmods%{?1} = %{epoch}:%{version}-%{release} Provides: java-%{javaver}-%{origin}-jmods%{?1} = %{epoch}:%{version}-%{release} @@ -1230,7 +1230,7 @@ Provides: java-jmods%{?1} = %{epoch}:%{version}-%{release} %define java_demo_rpo() %{expand: Requires: %{name}%{?1}%{?_isa} = %{epoch}:%{version}-%{release} -OrderWithRequires: %{name}-headless%{?1}%{?_isa} = %{epoch}:%{version}-%{release} +#OrderWithRequires: %{name}-headless%{?1}%{?_isa} = %{epoch}:%{version}-%{release} Provides: java-%{javaver}-demo%{?1} = %{epoch}:%{version}-%{release} Provides: java-%{javaver}-%{origin}-demo%{?1} = %{epoch}:%{version}-%{release} @@ -1241,7 +1241,7 @@ Provides: java-%{origin}-demo%{?1} = %{epoch}:%{version}-%{release} } %define java_javadoc_rpo() %{expand: -OrderWithRequires: %{name}-headless%{?1}%{?_isa} = %{epoch}:%{version}-%{release} +#OrderWithRequires: %{name}-headless%{?1}%{?_isa} = %{epoch}:%{version}-%{release} # Post requires alternatives to install javadoc alternative Requires(post): %{alternatives_requires} # Postun requires alternatives to uninstall javadoc alternative