diff --git a/icedtea-web.spec b/icedtea-web.spec index 54ed967..70f51e6 100644 --- a/icedtea-web.spec +++ b/icedtea-web.spec @@ -29,6 +29,8 @@ URL: https://openwebstart.com/ Source0: https://github.com/AdoptOpenJDK/IcedTea-Web/archive/%{name}-%{version}-pre.0.alpha13.patched1.tar.xz Patch0: patchOutDunce.patch Patch1: launchersPhase.patch +# this should be upstreamed. In build tasks which lauches java are using runtime JRE, should beusing SDK, but there is no place where to set it +Patch2: usePathJdkForDifferentBuildAndRuntimeJre.patch BuildRequires: javapackages-tools #for deprecated add_maven_depmap, see https://www.spinics.net/lists/fedora-devel/msg233211.html @@ -112,6 +114,7 @@ This package contains ziped sources of the IcedTea-Web project. %patch0 -p1 dos2unix launchers/pom.xml %patch1 -p0 +%patch2 -p1 %pom_remove_plugin org.codehaus.mojo:buildnumber-maven-plugin %pom_remove_plugin org.apache.maven.plugins:maven-source-plugin %pom_remove_plugin org.jacoco:jacoco-maven-plugin diff --git a/usePathJdkForDifferentBuildAndRuntimeJre.patch b/usePathJdkForDifferentBuildAndRuntimeJre.patch new file mode 100644 index 0000000..7b446f4 --- /dev/null +++ b/usePathJdkForDifferentBuildAndRuntimeJre.patch @@ -0,0 +1,36 @@ +diff -Naur "icedtea-web-master (copy)/launchers/build.sh" icedtea-web-master/launchers/build.sh +--- "icedtea-web-master (copy)/launchers/build.sh" 2020-05-07 21:52:58.000000000 +0200 ++++ icedtea-web-master/launchers/build.sh 2020-05-10 12:43:53.550337991 +0200 +@@ -129,7 +129,7 @@ + -e "s|[@]MICRO_VERSION[@]|$MICRO_VERSION|g" \ + -e "s/[@]PACKAGE_VERSION[@]/$PACKAGE_VERSION/g" \ + $WIN_INSTALLER_DIR/installer.json.in > $TARGET_TMP/itw-installer.json +- "$JRE/bin/java" -jar "$WIXGEN_JAR" "$TARGET_IMAGES/`imageName $WIN_SUFFIX`" -c $TARGET_TMP/itw-installer.json -o $TARGET_TMP/itw-installer.wxs ++ "java" -jar "$WIXGEN_JAR" "$TARGET_IMAGES/`imageName $WIN_SUFFIX`" -c $TARGET_TMP/itw-installer.json -o $TARGET_TMP/itw-installer.wxs + pushd $TARGET_TMP + "$WIX_TOOLSET_DIR/candle.exe" -nologo itw-installer.wxs + "$WIX_TOOLSET_DIR/light.exe" -nologo -sval -ext WixUIExtension itw-installer.wixobj +diff -Naur "icedtea-web-master (copy)/launchers/configure.sh" icedtea-web-master/launchers/configure.sh +--- "icedtea-web-master (copy)/launchers/configure.sh" 2020-05-07 21:40:57.000000000 +0200 ++++ icedtea-web-master/launchers/configure.sh 2020-05-10 12:44:06.163463501 +0200 +@@ -75,7 +75,7 @@ + + if [ "x$ITW_LIBS" == "xDISTRIBUTION" ] ; then + readonly JAVAWS_SRC=`ls $PROJECT_TOP/artifact-no-dependencies/target/icedtea-web-no-dependencies-*.jar | grep -v sources | grep -v javadoc | grep -v shaded` +- readonly OPTIONS_COMMAND="$JRE/bin/java -cp ++ readonly OPTIONS_COMMAND="java -cp + `ls $PROJECT_TOP/artifact-all-dependencies/target/icedtea-web-all-dependencies-*.jar | grep -v sources | grep -v javadoc | grep -v shaded` + net.adoptopenjdk.icedteaweb.commandline.CommandLineOptionsDefinition" ; + else +diff -Naur "icedtea-web-master (copy)/launchers/utils.sh" icedtea-web-master/launchers/utils.sh +--- "icedtea-web-master (copy)/launchers/utils.sh" 2020-05-07 21:44:56.000000000 +0200 ++++ icedtea-web-master/launchers/utils.sh 2020-05-10 12:45:32.689324481 +0200 +@@ -140,7 +140,7 @@ + local WIN_LOC_OVERWRITE="-Duser.language=$ID -Duser.country=$COUNTRY -Dfile.encoding=$ENCOD" + fi + mkdir -p $langDir +- "$JRE"/bin/java \ ++ java \ + $WIN_LOC_OVERWRITE \ + -cp `createCp $JAVAWS_SRC` \ + net.sourceforge.jnlp.util.docprovider.TextsProvider \