From d79bb47fccaf9e8a8dbbb1fc9d4fa653ad37b4c3 Mon Sep 17 00:00:00 2001 From: Victor Ryzhikh Date: Fri, 28 Feb 2020 12:32:48 +0000 Subject: [PATCH] rpm5 -> rpm4 (7) --- java-1.8.0-openjdk.spec | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index b06a4af..30db781 100644 --- a/java-1.8.0-openjdk.spec +++ b/java-1.8.0-openjdk.spec @@ -740,8 +740,6 @@ Provides: java-%{origin}%{?1} = %{epoch}:%{version}-%{release} Provides: java%{?1} = %{epoch}:%{javaver} # Standard JPackage extensions provides. Provides: java-fonts%{?1} = %{epoch}:%{version} - -Obsoletes: java-1.7.0-openjdk%{?1} < %{EVRD} } %global java_headless_rpo() %{expand: @@ -800,8 +798,6 @@ Provides: java-sdk%{?1} = %{epoch}:%{javaver} Provides: java-%{javaver}-devel%{?1} = %{epoch}:%{version} Provides: java-devel-%{origin}%{?1} = %{epoch}:%{version} Provides: java-devel%{?1} = %{epoch}:%{javaver} - -Obsoletes: java-1.7.0-openjdk-devel%{?1} < %{EVRD} } @@ -823,22 +819,16 @@ Requires(postun): update-alternatives Provides: java-javadoc%{?1} = %{epoch}:%{version}-%{release} Provides: java-%{javaver}-javadoc%{?1} = %{epoch}:%{version}-%{release} -Obsoletes: java-1.7.0-openjdk-javadoc%{?1} < %{EVRD} - } %global java_src_rpo() %{expand: Requires: %{name}-headless%{?1} = %{epoch}:%{version}-%{release} - -Obsoletes: java-1.7.0-openjdk-src%{?1} < %{EVRD} } %global java_accessibility_rpo() %{expand: Requires: java-atk-wrapper Requires: %{name}%{?1} = %{epoch}:%{version}-%{release} #OrderWithRequires: %{name}-headless%{?1} = %{epoch}:%{version}-%{release} - -Obsoletes: java-1.7.0-openjdk-accessibility%{?1} < %{EVRD} } # Prevent brp-java-repack-jars from being run.