From 1bc37cfe210f7df8ebc534974b9503afc73410fc Mon Sep 17 00:00:00 2001 From: Andrey Bondrov Date: Fri, 20 Jan 2017 16:45:55 +1000 Subject: [PATCH] Fix unversioned Obsoletes --- java-1.8.0-openjdk.spec | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index 27a03cf..b374b03 100644 --- a/java-1.8.0-openjdk.spec +++ b/java-1.8.0-openjdk.spec @@ -649,7 +649,7 @@ Provides: java%1 = %{epoch}:%{javaver} # Standard JPackage extensions provides. Provides: java-fonts%1 = %{epoch}:%{version} -Obsoletes: java-1.7.0-openjdk%1 +Obsoletes: java-1.7.0-openjdk%1 < %{EVRD} } %global java_headless_rpo() %{expand: @@ -690,7 +690,7 @@ Provides: jce%1 = %{epoch}:%{version} Provides: jdbc-stdext%1 = 4.1 Provides: java-sasl%1 = %{epoch}:%{version} -Obsoletes: java-1.7.0-openjdk-headless%1 +Obsoletes: java-1.7.0-openjdk-headless%1 < %{EVRD} } %global java_devel_rpo() %{expand: @@ -711,7 +711,7 @@ 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 +Obsoletes: java-1.7.0-openjdk-devel%1 < %{EVRD} } @@ -719,7 +719,7 @@ Obsoletes: java-1.7.0-openjdk-devel%1 Requires: %{name}%1 = %{epoch}:%{version}-%{release} #OrderWithRequires: %{name}-headless%1 = %{epoch}:%{version}-%{release} -Obsoletes: java-1.7.0-openjdk-demo%1 +Obsoletes: java-1.7.0-openjdk-demo%1 < %{EVRD} } %global java_javadoc_rpo() %{expand: @@ -733,14 +733,14 @@ 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 +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 +Obsoletes: java-1.7.0-openjdk-src%1 < %{EVRD} } %global java_accessibility_rpo() %{expand: @@ -748,7 +748,7 @@ 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 +Obsoletes: java-1.7.0-openjdk-accessibility%1 < %{EVRD} } # Prevent brp-java-repack-jars from being run. @@ -756,7 +756,7 @@ Obsoletes: java-1.7.0-openjdk-accessibility%1 Name: java-%{javaver}-%{origin} Version: %{javaver}.%{updatever} -Release: 1.%{buildver}.3 +Release: 1.%{buildver}.4 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons, # and this change was brought into RHEL-4. java-1.5.0-ibm packages # also included the epoch in their virtual provides. This created a @@ -1798,6 +1798,3 @@ require "copy_jdk_configs.lua" %{files_accessibility %{debug_suffix_unquoted}} %endif - - -