rpms/java-21-openjdk
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Changed rpmrelease to 3, replaced previously missed occurences of PR3681 with PR3755

Browse Source
This commit is contained in:
Petra Mikova 2019-10-21 08:38:32 +02:00
parent 2fc99891cd
commit 3a77472506
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
generate_source_tarball.sh
View File

@ -4,7 +4,7 @@
# Example: # Example:
# When used from local repo set REPO_ROOT pointing to file:// with your repo # When used from local repo set REPO_ROOT pointing to file:// with your repo
# If your local repo follows upstream forests conventions, it may be enough to set OPENJDK_URL # If your local repo follows upstream forests conventions, it may be enough to set OPENJDK_URL
# If you want to use a local copy of patch PR3681, set the path to it in the PR3681 variable # If you want to use a local copy of patch PR3755, set the path to it in the PR3755 variable
# #
# In any case you have to set PROJECT_NAME REPO_NAME and VERSION. eg: # In any case you have to set PROJECT_NAME REPO_NAME and VERSION. eg:
# PROJECT_NAME=jdk # PROJECT_NAME=jdk
@ -47,7 +47,7 @@ if [ "x$1" = "xhelp" ] ; then
echo "COMPRESSION - the compression type to use (optional; defaults to ${COMPRESSION_DEFAULT})" echo "COMPRESSION - the compression type to use (optional; defaults to ${COMPRESSION_DEFAULT})"
echo "FILE_NAME_ROOT - name of the archive, minus extensions (optional; defaults to PROJECT_NAME-REPO_NAME-VERSION)" echo "FILE_NAME_ROOT - name of the archive, minus extensions (optional; defaults to PROJECT_NAME-REPO_NAME-VERSION)"
echo "TO_COMPRESS - what part of clone to pack (default is openjdk)" echo "TO_COMPRESS - what part of clone to pack (default is openjdk)"
echo "PR3755 - the path to the PR3681 patch to apply (optional; downloaded if unavailable)" echo "PR3755 - the path to the PR3755 patch to apply (optional; downloaded if unavailable)"
exit 1; exit 1;
fi fi
@ -127,8 +127,8 @@ pushd "${FILE_NAME_ROOT}"
echo "Syncing EC list with NSS" echo "Syncing EC list with NSS"
if [ "x$PR3755" = "x" ] ; then if [ "x$PR3755" = "x" ] ; then
# originally for 8: # originally for 8:
# get pr3681.patch (from http://icedtea.classpath.org/hg/icedtea11) from most correct tag # get pr3755.patch (from http://icedtea.classpath.org/hg/icedtea11) from most correct tag
# Do not push it or publish it (see http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3681) # Do not push it or publish it (see http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3755)
echo "PR3755 not found. Downloading..." echo "PR3755 not found. Downloading..."
wget http://icedtea.classpath.org/hg/icedtea13/raw-file/tip/patches/pr3755.patch wget http://icedtea.classpath.org/hg/icedtea13/raw-file/tip/patches/pr3755.patch
echo "Applying ${PWD}/pr3755.patch" echo "Applying ${PWD}/pr3755.patch"

8
java-latest-openjdk.spec
View File

@ -219,7 +219,7 @@
%global top_level_dir_name %{origin} %global top_level_dir_name %{origin}
%global minorver 0 %global minorver 0
%global buildver 33 %global buildver 33
%global rpmrelease 6 %global rpmrelease 3
# 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 # 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 %if %is_system_jdk
%global priority %( printf '%02d%02d%02d%02d' %{majorver} %{minorver} %{securityver} %{buildver} ) %global priority %( printf '%02d%02d%02d%02d' %{majorver} %{minorver} %{securityver} %{buildver} )
@ -1802,15 +1802,15 @@ require "copy_jdk_configs.lua"
%changelog %changelog
* Wed Oct 16 2019 Petra Alice Mikova <pmikova@redhat.com> - 1:13.0.0.33-6.rolling * Wed Oct 16 2019 Petra Alice Mikova <pmikova@redhat.com> - 1:13.0.0.33-3.rolling
- synced up generate tarball script with other OpenJDK packages - synced up generate tarball script with other OpenJDK packages
- dropped pr2126-synchronise_elliptic_curves_in_sun_security_ec_namedcurve_with_those_listed_by_nss.patch from the sources - dropped pr2126-synchronise_elliptic_curves_in_sun_security_ec_namedcurve_with_those_listed_by_nss.patch from the sources
- regenerated sources with the updated script - regenerated sources with the updated script
* Wed Oct 02 2019 Andrew Hughes <gnu.andrew@redhat.com> - 1:13.0.0.33-5.rolling * Wed Oct 02 2019 Andrew Hughes <gnu.andrew@redhat.com> - 1:13.0.0.33-3.rolling
- Switch to in-tree SunEC code, dropping NSS runtime dependencies and patches to link against it. - Switch to in-tree SunEC code, dropping NSS runtime dependencies and patches to link against it.
* Wed Oct 02 2019 Andrew John Hughes <gnu.andrew@redhat.com> - 1:13.0.0.33-4.rolling * Wed Oct 02 2019 Andrew John Hughes <gnu.andrew@redhat.com> - 1:13.0.0.33-3.rolling
- Drop unnecessary build requirement on gtk3-devel, as OpenJDK searches for Gtk+ at runtime. - Drop unnecessary build requirement on gtk3-devel, as OpenJDK searches for Gtk+ at runtime.
- Add missing build requirement for libXrender-devel, previously masked by Gtk3+ dependency - Add missing build requirement for libXrender-devel, previously masked by Gtk3+ dependency
- Add missing build requirement for libXrandr-devel, previously masked by Gtk3+ dependency - Add missing build requirement for libXrandr-devel, previously masked by Gtk3+ dependency