| |
@@ -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
|
| |
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: