rpms
/
java-latest-openjdk
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update for JDK 15 GA

This commit is contained in:
Severin Gehwolf 2020-09-15 16:58:04 +02:00
parent 194eadfb57
commit b5bb50fc8f
4 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
generate_source_tarball.sh
View File

@ -26,9 +26,9 @@
# level folder, name is created, based on parameter # level folder, name is created, based on parameter
# #
if [ ! "x$PR3788" = "x" ] ; then if [ ! "x$PR3803" = "x" ] ; then
if [ ! -f "$PR3788" ] ; then if [ ! -f "$PR3803" ] ; then
echo "You have specified PR3788 as $PR3788 but it does not exist. Exiting" echo "You have specified PR3803 as $PR3803 but it does not exist. Exiting"
exit 1 exit 1
fi fi
fi fi
@ -125,18 +125,18 @@ pushd "${FILE_NAME_ROOT}"
rm -vf ${CRYPTO_PATH}/ecp_224.c rm -vf ${CRYPTO_PATH}/ecp_224.c
echo "Syncing EC list with NSS" echo "Syncing EC list with NSS"
if [ "x$PR3788" = "x" ] ; then if [ "x$PR3803" = "x" ] ; then
# originally for 8: # originally for 8:
# get PR3788.patch (from http://icedtea.classpath.org/hg/icedtea14) from most correct tag # get PR3803.patch (from http://icedtea.classpath.org/hg/icedtea15) from most correct tag
# Do not push it or publish it (see https://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3788) # Do not push it or publish it (see https://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3803)
echo "PR3788 not found. Downloading..." echo "PR3803 not found. Downloading..."
wget http://icedtea.classpath.org/hg/icedtea14/raw-file/fabce78297b7/patches/pr3788.patch wget https://icedtea.classpath.org/hg/icedtea15/raw-file/d68ffcc9a497/patches/pr3803.patch
echo "Applying ${PWD}/pr3788.patch" echo "Applying ${PWD}/pr3803.patch"
patch -Np1 < pr3788.patch patch -Np1 < pr3803.patch
rm pr3788.patch rm pr3803.patch
else else
echo "Applying ${PR3788}" echo "Applying ${PR3803}"
patch -Np1 < $PR3788 patch -Np1 < $PR3803
fi; fi;
find . -name '*.orig' -exec rm -vf '{}' ';' find . -name '*.orig' -exec rm -vf '{}' ';'
popd popd

8
java-latest-openjdk.spec
View File

@ -208,7 +208,7 @@
# buildjdkver is usually same as %%{majorver}, # buildjdkver is usually same as %%{majorver},
# but in time of bootstrap of next jdk, it is majorver-1, # but in time of bootstrap of next jdk, it is majorver-1,
# and this it is better to change it here, on single place # and this it is better to change it here, on single place
%global buildjdkver 14 %global buildjdkver 15
# We don't add any LTS designator for STS packages (this package). # We don't add any LTS designator for STS packages (this package).
# Neither for Fedora nor EPEL which would have %%{rhel} macro defined. # Neither for Fedora nor EPEL which would have %%{rhel} macro defined.
%global lts_designator "" %global lts_designator ""
@ -236,7 +236,7 @@
# Release will be (where N is usually a number starting at 1): # Release will be (where N is usually a number starting at 1):
# - 0.N%%{?extraver}%%{?dist} for EA releases, # - 0.N%%{?extraver}%%{?dist} for EA releases,
# - N%%{?extraver}{?dist} for GA releases # - N%%{?extraver}{?dist} for GA releases
%global is_ga 0 %global is_ga 1
%if %{is_ga} %if %{is_ga}
%global ea_designator "" %global ea_designator ""
%global ea_designator_zip "" %global ea_designator_zip ""
@ -1820,6 +1820,10 @@ require "copy_jdk_configs.lua"
%changelog %changelog
* Tue Sep 15 2020 Severin Gehwolf <sgehwolf@redhat.com> - 1:15.0.0.36-1.rolling
- Remove EA designation
- Re-generate sources with PR3803 patch
* Mon Aug 31 2020 Petra Alice Mikova <pmikova@redhat.com> - 1:15.0.0.36-0.1.ea.rolling * Mon Aug 31 2020 Petra Alice Mikova <pmikova@redhat.com> - 1:15.0.0.36-0.1.ea.rolling
- Update to jdk 15.0.0.36 tag - Update to jdk 15.0.0.36 tag
- Modify rh1648249-add_commented_out_nss_cfg_provider_to_java_security.patch - Modify rh1648249-add_commented_out_nss_cfg_provider_to_java_security.patch

2
sources
View File

@ -1,2 +1,2 @@
SHA512 (jdk-jdk15-jdk-15+36.tar.xz) = 943c45df5885daae2a9f064780d1b833770feb5ca4ade0411bfcdf4bad207ed5d7fbbe5adc0f9ba46da6ce83e3380a2975df8af6d0360fd28905ae07f652ce86 SHA512 (jdk-jdk15-jdk-15+36.tar.xz) = 0c03c5cdcfc7798e3a8026b1e86fa283a5c17cc2638f25e80a4eab9a0c82d3cf43d28f574cce237c9ba6129a722f10db5f66b163edabf589b9cc90365ce3a5a7
SHA512 (systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz) = cf578221b77d8c7e019f69909bc86c419c5fb5e10bceba9592ff6e7f96887b0a7f07c9cefe90800975247a078785ca190fdec5c2d0f841bb447cee784b570f7d SHA512 (systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz) = cf578221b77d8c7e019f69909bc86c419c5fb5e10bceba9592ff6e7f96887b0a7f07c9cefe90800975247a078785ca190fdec5c2d0f841bb447cee784b570f7d

5
update_package.sh
View File

@ -33,9 +33,8 @@ fi
# OpenJDK from Shenandoah project # OpenJDK from Shenandoah project
export PROJECT_NAME="jdk" export PROJECT_NAME="jdk"
export REPO_NAME="jdk12" export REPO_NAME="jdk15"
# warning, clonning without shenadnaoh suffix, you will clone pure jdk - thus without shenandaoh GC export VERSION="jdk-15+36"
export VERSION="jdk-12+25"
export COMPRESSION=xz export COMPRESSION=xz
# unset tapsets overrides # unset tapsets overrides
export OPENJDK_URL="" export OPENJDK_URL=""