From aaedfc554ed8429191b75a38108e92f516465fd3 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Jun 17 2017 11:58:54 +0000 Subject: adapted to no longer noarch openjfx-devel --- diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index 8fce91d..c4b9c97 100644 --- a/java-1.8.0-openjdk.spec +++ b/java-1.8.0-openjdk.spec @@ -814,7 +814,7 @@ Obsoletes: java-1.7.0-openjdk-accessibility%1 Name: java-%{javaver}-%{origin} Version: %{javaver}.%{updatever} -Release: 6.%{buildver}%{?dist} +Release: 7.%{buildver}%{?dist} # 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 @@ -1245,7 +1245,7 @@ Set of links from OpenJDK (jre) to OpenJFX %package openjfx-devel Summary: OpenJDK x OpenJFX connector for FX developers. This package adds symliks finishing Java FX integration to %{name}-devel Requires: %{name}-devel%{?_isa} = %{epoch}:%{version}-%{release} -Requires: openjfx-devel +Requires: openjfx-devel%{?_isa} Provides: javafx-devel = %{epoch}:%{version}-%{release} %description openjfx-devel Set of links from OpenJDK (sdk) to OpenJFX @@ -1262,7 +1262,7 @@ Set of links from OpenJDK-debug (jre) to normal OpenJFX. OpenJFX do not support %package openjfx-devel-debug Summary: OpenJDK x OpenJFX connector for FX developers %{for_debug}. This package adds symliks finishing Java FX integration to %{name}-devel-debug Requires: %{name}-devel-debug%{?_isa} = %{epoch}:%{version}-%{release} -Requires: openjfx-devel +Requires: openjfx-devel%{?_isa} Provides: javafx-devel-debug = %{epoch}:%{version}-%{release} %description openjfx-devel-debug Set of links from OpenJDK-debug (sdk) to normal OpenJFX. OpenJFX do not support debug buuilds of itself @@ -2081,6 +2081,9 @@ require "copy_jdk_configs.lua" %endif %changelog +* Sat Jun 17 2017 Jiri Vanek - 1:1.8.0.131-7.b12 +- adapted to no longer noarch openjfx-devel + * Wed Jun 07 2017 Jiri Vanek - 1:1.8.0.131-6.b12 - added virtualprovides for javafx