#81 Sync desktop files with upstream IcedTea release 3.15.0 using new script
Merged 2 years ago by ahughes. Opened 2 years ago by ahughes.
rpms/ ahughes/java-latest-openjdk icedtea  into  rawhide

file modified
+1
@@ -23,6 +23,7 @@ 

  ICEDTEA_SIGNING_KEY=CFDA0F9B35964222

  

  ICEDTEA_HG_URL=https://icedtea.classpath.org/hg/icedtea11

+ 

  set -e

  

  RPM_DIR=${PWD}

file modified
+11 -6
@@ -298,7 +298,7 @@ 

  %global top_level_dir_name   %{origin}

  %global top_level_dir_name_backup %{top_level_dir_name}-backup

  %global buildver        12

- %global rpmrelease      4

+ %global rpmrelease      5

  # Priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit

  %if %is_system_jdk

  # Using 10 digits may overflow the int used for priority, so we combine the patch and build versions
@@ -1609,7 +1609,7 @@ 

  

  for suffix in %{build_loop} ; do

    for file in "tapset"$suffix/*.in; do

-     OUTPUT_FILE=`echo $file | sed -e "s:\.stp\.in$:%{version}-%{release}.%{_arch}.stp:g"`

+     OUTPUT_FILE=`echo $file | sed -e "s:\.stp\.in$:-%{version}-%{release}.%{_arch}.stp:g"`

      sed -e "s:@ABS_SERVER_LIBJVM_SO@:%{_jvmdir}/%{sdkdir -- $suffix}/lib/server/libjvm.so:g" $file > $file.1

      sed -e "s:@JAVA_SPEC_VER@:%{javaver}:g" $file.1 > $file.2

  # TODO find out which architectures other than i686 have a client vm
@@ -1627,16 +1627,18 @@ 

  %endif

  

  # Prepare desktop files

+ # The _X_ syntax indicates variables that are replaced by make upstream

+ # The @X@ syntax indicates variables that are replaced by configure upstream

  for suffix in %{build_loop} ; do

  for file in %{SOURCE9}; do

      FILE=`basename $file | sed -e s:\.in$::g`

      EXT="${FILE##*.}"

      NAME="${FILE%.*}"

      OUTPUT_FILE=$NAME$suffix.$EXT

-     sed    -e  "s:@JAVA_HOME@:%{sdkbindir -- $suffix}:g" $file > $OUTPUT_FILE

-     sed -i -e  "s:@JRE_HOME@:%{jrebindir -- $suffix}:g" $OUTPUT_FILE

-     sed -i -e  "s:@ARCH@:%{version}-%{release}.%{_arch}$suffix:g" $OUTPUT_FILE

-     sed -i -e  "s:@JAVA_MAJOR_VERSION@:%{featurever}:g" $OUTPUT_FILE

+     sed    -e  "s:_SDKBINDIR_:%{sdkbindir -- $suffix}:g" $file > $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

  done
@@ -2358,6 +2360,9 @@ 

  %endif

  

  %changelog

+ * Thu Oct 28 2021 Andrew Hughes <gnu.andrew@redhat.com> - 1:17.0.1.0.12-5.rolling

+ - Sync desktop files with upstream IcedTea release 3.15.0 using new script

+ 

  * Tue Oct 26 2021 Andrew Hughes <gnu.andrew@redhat.com> - 1:17.0.1.0.12-4.rolling

  - Restructure the build so a minimal initial build is then used for the final build (with docs)

  - This reduces pressure on the system JDK and ensures the JDK being built can do a full build

file modified
+4 -4
@@ -1,8 +1,8 @@ 

  [Desktop Entry]

- Name=OpenJDK @JAVA_MAJOR_VERSION@ Monitoring & Management Console @ARCH@

- Comment=Monitor and manage OpenJDK @JAVA_MAJOR_VERSION@ applications for @ARCH@

- Exec=@JAVA_HOME@/jconsole

- Icon=java-@JAVA_MAJOR_VERSION@-@JAVA_VENDOR@

+ Name=OpenJDK @JAVA_VER@ for @target_cpu@ Monitoring & Management Console (@OPENJDK_VER@)

+ Comment=Monitor and manage OpenJDK applications

+ Exec=_SDKBINDIR_/jconsole

+ Icon=java-@JAVA_VER@-@JAVA_VENDOR@

  Terminal=false

  Type=Application

  StartupWMClass=sun-tools-jconsole-JConsole

While the icedtea_sync.sh script seems to have been imported into java-latest-openjdk, some of the associated changes to the spec file from this java-11-openjdk changeset were not imported.

This changes the jconsole.desktop file to match the format used by java-1.8.0-openjdk & java-11-openjdk:

$ diff -u /usr/share/applications/java-17-openjdk-17.0.1.0.12-1.rolling.fc33.x86_64-jconsole.desktop ~/rpmbuild/BUILD/java-17-openjdk-17.0.1.0.12-5.rolling.fc33.x86_64/jconsole.desktop 
--- /usr/share/applications/java-17-openjdk-17.0.1.0.12-1.rolling.fc33.x86_64-jconsole.desktop  2021-10-21 21:06:57.000000000 +0100
+++ /home/andrew/rpmbuild/BUILD/java-17-openjdk-17.0.1.0.12-5.rolling.fc33.x86_64/jconsole.desktop      2021-11-01 13:57:19.136649612 +0000
@@ -1,11 +1,10 @@
 [Desktop Entry]
-Name=OpenJDK 17 Monitoring & Management Console 17.0.1.0.12-1.rolling.fc33.x86_64
-Comment=Monitor and manage OpenJDK 17 applications for 17.0.1.0.12-1.rolling.fc33.x86_64
-Exec=/usr/lib/jvm/java-17-openjdk-17.0.1.0.12-1.rolling.fc33.x86_64/bin/jconsole
+Name=OpenJDK 17 for x86_64 Monitoring & Management Console (17.0.1.0.12-5.rolling.fc33.x86_64)
+Comment=Monitor and manage OpenJDK applications
+Exec=/usr/lib/jvm/java-17-openjdk-17.0.1.0.12-5.rolling.fc33.x86_64/bin/jconsole

cool! let it live. TY!

(had compared them with my PR, as it was subset here, it is super clean) really thank you.

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci

Pull-Request has been merged by ahughes

2 years ago