From 546ea4a5014a76be8b4390bb70679b6467660ab8 Mon Sep 17 00:00:00 2001 From: Andrew Hughes Date: Tue, 6 Jul 2021 04:40:43 +0100 Subject: [PATCH] Remove OpenJFX support as OpenJFX is not in RHEL. Resolves: rhbz#1973522 --- java-1.8.0-openjdk.spec | 139 +++------------------------------------- 1 file changed, 9 insertions(+), 130 deletions(-) diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index c4f0c94..aef1a2f 100644 --- a/java-1.8.0-openjdk.spec +++ b/java-1.8.0-openjdk.spec @@ -245,26 +245,6 @@ # New Version-String scheme-style defines %global majorver 8 -%ifarch %{ix86} x86_64 -%global with_openjfx_binding 1 -%global openjfx_path %{_jvmdir}/openjfx8 -# links src directories -%global jfx_jre_libs_dir %{openjfx_path}/rt/lib -%global jfx_jre_native_dir %{jfx_jre_libs_dir}/%{archinstall} -%global jfx_sdk_libs_dir %{openjfx_path}/lib -%global jfx_sdk_bins_dir %{openjfx_path}/bin -%global jfx_jre_exts_dir %{jfx_jre_libs_dir}/ext -# links src files -# maybe depend on jfx and generate the lists in build time? Yes, bad idea to inlcude cyclic depndenci, but this list is aweful -%global jfx_jre_libs jfxswt.jar javafx.properties -%global jfx_jre_native libprism_es2.so libprism_common.so libjavafx_font.so libdecora_sse.so libjavafx_font_freetype.so libprism_sw.so libjavafx_font_pango.so libglass.so libjavafx_iio.so libglassgtk2.so libglassgtk3.so -%global jfx_sdk_libs javafx-mx.jar packager.jar ant-javafx.jar -%global jfx_sdk_bins javafxpackager javapackager -%global jfx_jre_exts jfxrt.jar -%else -%global with_openjfx_binding 0 -%endif - # Define IcedTea version used for SystemTap tapsets and desktop file %global icedteaver 3.15.0 @@ -311,7 +291,7 @@ %global updatever %(VERSION=%{whole_update}; echo ${VERSION##*u}) # eg jdk8u60-b27 -> b27 %global buildver %(VERSION=%{version_tag}; echo ${VERSION##*-}) -%global rpmrelease 2 +%global rpmrelease 3 # Define milestone (EA for pre-releases, GA ("fcs") for releases) # Release will be (where N is usually a number starting at 1): # - 0.N%%{?extraver}%%{?dist} for EA releases, @@ -1657,60 +1637,6 @@ BuildArch: noarch The %{origin_nice} %{majorver} API documentation compressed in a single archive. %endif -%if %{with_openjfx_binding} -%package openjfx -Summary: OpenJDK x OpenJFX connector. This package adds symliks finishing Java FX integration to %{name} -Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} -Requires: openjfx8%{?_isa} -Provides: javafx = %{epoch}:%{version}-%{release} -%description openjfx -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: openjfx8-devel%{?_isa} -Provides: javafx-devel = %{epoch}:%{version}-%{release} -%description openjfx-devel -Set of links from OpenJDK (sdk) to OpenJFX - -%if %{include_debug_build} -%package openjfx-slowdebug -Summary: OpenJDK x OpenJFX connector %{for_debug}. his package adds symliks finishing Java FX integration to %{name}-slowdebug -Requires: %{name}-slowdebug%{?_isa} = %{epoch}:%{version}-%{release} -Requires: openjfx8%{?_isa} -Provides: javafx-slowdebug = %{epoch}:%{version}-%{release} -%description openjfx-slowdebug -Set of links from OpenJDK-slowdebug (jre) to normal OpenJFX. OpenJFX do not support debug buuilds of itself - -%package openjfx-devel-slowdebug -Summary: OpenJDK x OpenJFX connector for FX developers %{for_debug}. This package adds symliks finishing Java FX integration to %{name}-devel-slowdebug -Requires: %{name}-devel-slowdebug%{?_isa} = %{epoch}:%{version}-%{release} -Requires: openjfx8-devel%{?_isa} -Provides: javafx-devel-slowdebug = %{epoch}:%{version}-%{release} -%description openjfx-devel-slowdebug -Set of links from OpenJDK-slowdebug (sdk) to normal OpenJFX. OpenJFX do not support debug buuilds of itself -%endif - -%if %{include_fastdebug_build} -%package openjfx-fastdebug -Summary: OpenJDK x OpenJFX connector %{for_fastdebug}. his package adds symliks finishing Java FX integration to %{name}-fastdebug -Requires: %{name}-fastdebug%{?_isa} = %{epoch}:%{version}-%{release} -Requires: openjfx8%{?_isa} -Provides: javafx-fastdebug = %{epoch}:%{version}-%{release} -%description openjfx-fastdebug -Set of links from OpenJDK-fastdebug (jre) to normal OpenJFX. OpenJFX do not support debug buuilds of itself - -%package openjfx-devel-fastdebug -Summary: OpenJDK x OpenJFX connector for FX developers %{for_fastdebug}. This package adds symliks finishing Java FX integration to %{name}-devel-slowdebug -Requires: %{name}-devel-fastdebug%{?_isa} = %{epoch}:%{version}-%{release} -Requires: openjfx8-devel%{?_isa} -Provides: javafx-devel-fastdebug = %{epoch}:%{version}-%{release} -%description openjfx-devel-fastdebug -Set of links from OpenJDK-fastdebug (sdk) to normal OpenJFX. OpenJFX do not support debug buuilds of itself -%endif -%endif - %prep # Using the echo macro breaks rpmdev-bumpspec, as it parses the first line of stdout :-( @@ -2263,44 +2189,6 @@ find $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir -- $suffix}/demo \ | sed 's|^|%dir |' \ >> %{name}-demo.files"$suffix" -# intentionally after all else, fx links with redirections on its own -%if %{with_openjfx_binding} - FXSDK_FILES=%{name}-openjfx-devel.files"$suffix" - FXJRE_FILES=%{name}-openjfx.files"$suffix" - echo -n "" > $FXJRE_FILES - echo -n "" > $FXSDK_FILES - for file in %{jfx_jre_libs} ; do - srcfile=%{jfx_jre_libs_dir}/$file - targetfile=%{_jvmdir}/%{jredir -- $suffix}/lib/$file - ln -s $srcfile $RPM_BUILD_ROOT/$targetfile - echo $targetfile >> $FXJRE_FILES - done - for file in %{jfx_jre_native} ; do - srcfile=%{jfx_jre_native_dir}/$file - targetfile=%{_jvmdir}/%{jredir -- $suffix}/lib/%{archinstall}/$file - ln -s $srcfile $RPM_BUILD_ROOT/$targetfile - echo $targetfile >> $FXJRE_FILES - done - for file in %{jfx_jre_exts} ; do - srcfile=%{jfx_jre_exts_dir}/$file - targetfile=%{_jvmdir}/%{jredir -- $suffix}/lib/ext/$file - ln -s $srcfile $RPM_BUILD_ROOT/$targetfile - echo $targetfile >> $FXJRE_FILES - done - for file in %{jfx_sdk_libs} ; do - srcfile=%{jfx_sdk_libs_dir}/$file - targetfile=%{_jvmdir}/%{sdkdir -- $suffix}/lib/$file - ln -s $srcfile $RPM_BUILD_ROOT/$targetfile - echo $targetfile >> $FXSDK_FILES - done - for file in %{jfx_sdk_bins} ; do - srcfile=%{jfx_sdk_bins_dir}/$file - targetfile=%{_jvmdir}/%{sdkdir -- $suffix}/bin/$file - ln -s $srcfile $RPM_BUILD_ROOT/$targetfile - echo $targetfile >> $FXSDK_FILES - done -%endif - bash %{SOURCE20} $RPM_BUILD_ROOT/%{_jvmdir}/%{jredir -- $suffix} %{javaver} # https://bugzilla.redhat.com/show_bug.cgi?id=1183793 touch -t 201401010000 $RPM_BUILD_ROOT/%{_jvmdir}/%{jredir -- $suffix}/lib/security/java.security @@ -2495,11 +2383,6 @@ cjc.mainProgram(args) %files javadoc-zip %{files_javadoc_zip %{nil}} -%if %{with_openjfx_binding} -%files openjfx -f %{name}-openjfx.files - -%files openjfx-devel -f %{name}-openjfx-devel.files -%endif %endif %if %{include_debug_build} @@ -2518,11 +2401,6 @@ cjc.mainProgram(args) %files src-slowdebug %{files_src -- %{debug_suffix_unquoted}} -%if %{with_openjfx_binding} -%files openjfx-slowdebug -f %{name}-openjfx.files-slowdebug - -%files openjfx-devel-slowdebug -f %{name}-openjfx-devel.files-slowdebug -%endif %endif %if %{include_fastdebug_build} @@ -2541,19 +2419,20 @@ cjc.mainProgram(args) %files src-fastdebug %{files_src -- %{fastdebug_suffix_unquoted}} -%if %{with_openjfx_binding} -%files openjfx-fastdebug -f %{name}-openjfx.files-fastdebug - -%files openjfx-devel-fastdebug -f %{name}-openjfx-devel.files-fastdebug -%endif %endif %changelog +* Tue Jul 06 2021 Andrew Hughes - 1:1.8.0.292.b10-3 +- Remove OpenJFX support as OpenJFX is not in RHEL. +- Resolves: rhbz#1973522 + * Tue Jun 22 2021 Jiri Vanek - 1:1.8.0.292.b10-2 -- removed cjc backward comaptiblity, to fix when both rpm 4.16 and 4.17 are in transaction +- Removed cjc backward compatiblity, to fix when both rpm 4.16 and 4.17 are in transaction +- Resolves: rhbz#1967813 * Tue Jun 22 2021 Jiri Vanek - 1:1.8.0.292.b10-1 -- adapted to newst cjc to fix issue with rpm 4.17 +- Adapted to newst cjc to fix issue with rpm 4.17 +- Resolves: rhbz#1967813 * Thu Jun 17 2021 Andrew Hughes - 1:1.8.0.292.b10-0 - Update to aarch64-shenandoah-jdk8u292-b10 (GA)