From c374350ed3862123e89ca0ee1ab196e377e3114b Mon Sep 17 00:00:00 2001 From: Andrew John Hughes Date: Fri, 13 Mar 2020 05:37:00 +0000 Subject: [PATCH] Sync SystemTap & desktop files with upstream IcedTea release 3.15.0, removing previous workarounds --- .gitignore | 1 + icedtea_sync.sh | 7 +------ java-1.8.0-openjdk.spec | 13 ++++++++----- jconsole.desktop.in | 4 ++-- policytool.desktop.in | 2 +- sources | 2 +- 6 files changed, 14 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index 4a7e0a1..21ee408 100644 --- a/.gitignore +++ b/.gitignore @@ -165,3 +165,4 @@ /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u242-b06.tar.xz /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u242-b07.tar.xz /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u242-b08.tar.xz +/tapsets-icedtea-3.15.0.tar.xz diff --git a/icedtea_sync.sh b/icedtea_sync.sh index a9d5881..061637b 100755 --- a/icedtea_sync.sh +++ b/icedtea_sync.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -ICEDTEA_VERSION=3.11.0 +ICEDTEA_VERSION=3.15.0 ICEDTEA_URL=https://icedtea.classpath.org/download/source ICEDTEA_SIGNING_KEY=CFDA0F9B35964222 @@ -89,11 +89,6 @@ echo "Replacing desktop files..."; mv -v icedtea-${ICEDTEA_VERSION}/jconsole.desktop.in . mv -v icedtea-${ICEDTEA_VERSION}/policytool.desktop.in . -echo "Adding temporary fix to policytool.desktop (PR3718)"; -sed -i 's#Development#Settings#' policytool.desktop.in -echo "Adding temporary fix to policytool.desktop (PR3719)"; -sed -i 's#_BINDIR_#_JREBINDIR_#' policytool.desktop.in - echo "Creating new tapset tarball..."; mv -v icedtea-${ICEDTEA_VERSION} openjdk ${TAR} cJf tapsets-icedtea-${ICEDTEA_VERSION}.tar.xz openjdk diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index e11888c..db472d8 100644 --- a/java-1.8.0-openjdk.spec +++ b/java-1.8.0-openjdk.spec @@ -224,7 +224,7 @@ %global repo %{shenandoah_repo} %global revision %{shenandoah_revision} # Define IcedTea version used for SystemTap tapsets and desktop files -%global icedteaver 3.11.0 +%global icedteaver 3.15.0 # e.g. aarch64-shenandoah-jdk8u212-b04-shenandoah-merge-2019-04-30 -> aarch64-shenandoah-jdk8u212-b04 %global version_tag %(VERSION=%{revision}; echo ${VERSION%%-shenandoah-merge*}) @@ -234,7 +234,7 @@ %global updatever %(VERSION=%{whole_update}; echo ${VERSION##*u}) # eg jdk8u60-b27 -> b27 %global buildver %(VERSION=%{version_tag}; echo ${VERSION##*-}) -%global rpmrelease 0 +%global rpmrelease 1 # 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, @@ -1595,10 +1595,10 @@ for file in %{SOURCE9} %{SOURCE10} ; do EXT="${FILE##*.}" NAME="${FILE%.*}" OUTPUT_FILE=$NAME$suffix.$EXT - sed -e "s:_BINDIR_:%{sdkbindir -- $suffix}:g" $file > $OUTPUT_FILE + sed -e "s:_SDKBINDIR_:%{sdkbindir -- $suffix}:g" $file > $OUTPUT_FILE sed -i -e "s:_JREBINDIR_:%{jrebindir -- $suffix}:g" $OUTPUT_FILE - sed -i -e "s:@target_cpu@:%{version}-%{release}.%{_arch}$suffix:g" $OUTPUT_FILE - sed -i -e "s:@OPENJDK_VER@:%{javaver}:g" $OUTPUT_FILE + sed -i -e "s:@target_cpu@:%{_arch}:g" $OUTPUT_FILE + sed -i -e "s:@OPENJDK_VER@:%{version}-%{release}.%{_arch}$suffix:g" $OUTPUT_FILE sed -i -e "s:@JAVA_VER@:%{javaver}:g" $OUTPUT_FILE sed -i -e "s:@JAVA_VENDOR@:%{origin}:g" $OUTPUT_FILE done @@ -2191,6 +2191,9 @@ require "copy_jdk_configs.lua" %endif %changelog +* Fri Mar 13 2020 Andrew John Hughes - 1:1.8.0.242.b08-1 +- Sync SystemTap & desktop files with upstream IcedTea release 3.15.0, removing previous workarounds + * Wed Mar 11 2020 Andrew John Hughes - 1:1.8.0.242.b08-0 - Update to aarch64-shenandoah-jdk8u242-b08. - Switch to GA mode for final release. diff --git a/jconsole.desktop.in b/jconsole.desktop.in index b88bd7c..8a3b04d 100644 --- a/jconsole.desktop.in +++ b/jconsole.desktop.in @@ -1,7 +1,7 @@ [Desktop Entry] -Name=OpenJDK @OPENJDK_VER@ for @target_cpu@ Monitoring & Management Console +Name=OpenJDK @JAVA_VER@ for @target_cpu@ Monitoring & Management Console (@OPENJDK_VER@) Comment=Monitor and manage OpenJDK applications -Exec=_BINDIR_/jconsole +Exec=_SDKBINDIR_/jconsole Icon=java-@JAVA_VER@-@JAVA_VENDOR@ Terminal=false Type=Application diff --git a/policytool.desktop.in b/policytool.desktop.in index 112a24f..5f4cb4a 100644 --- a/policytool.desktop.in +++ b/policytool.desktop.in @@ -1,5 +1,5 @@ [Desktop Entry] -Name=OpenJDK @OPENJDK_VER@ for @target_cpu@ Policy Tool +Name=OpenJDK @JAVA_VER@ for @target_cpu@ Policy Tool (@OPENJDK_VER@) Comment=Manage OpenJDK policy files Exec=_JREBINDIR_/policytool Icon=java-@JAVA_VER@-@JAVA_VENDOR@ diff --git a/sources b/sources index d5868e4..55ce4fd 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (tapsets-icedtea-3.11.0.tar.xz) = f98420b2f9d7a0fc0af3a7e6a817c4330169db9378d9c38db56b0dd8281a3f1ff7747b4da0c66194695ca85a470b7963902d863d301e5e290dbfe11f6b6f2b5e +SHA512 (tapsets-icedtea-3.15.0.tar.xz) = a0376b936e28392e1d66abb1fc6a8f715cc2085319e5496627d65a9d65d5d5e32fc7b9d3edeefed64087f597503fb2b54f0de613be01049aaa61b598d63945aa SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u242-b08.tar.xz) = 5102b72f47c53834942a2b970e0019f9de4fff32e4146bddfb8e0abcbf7805aa07456afb43fb9130cc3c1fd6d94bc0ab2e851d1d133fe2ec2a0fcffde3e288af