Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/java-1.8.0-openjdk.git#394d30bddda472e3b69dd5d9f48f2dbf4503c1f0
This commit is contained in:
DistroBaker 2021-01-26 14:38:54 +00:00
parent 764c6e902a
commit a96c7a2e24

View File

@ -289,7 +289,7 @@
%global updatever %(VERSION=%{whole_update}; echo ${VERSION##*u}) %global updatever %(VERSION=%{whole_update}; echo ${VERSION##*u})
# eg jdk8u60-b27 -> b27 # eg jdk8u60-b27 -> b27
%global buildver %(VERSION=%{version_tag}; echo ${VERSION##*-}) %global buildver %(VERSION=%{version_tag}; echo ${VERSION##*-})
%global rpmrelease 1 %global rpmrelease 2
# Define milestone (EA for pre-releases, GA ("fcs") for releases) # Define milestone (EA for pre-releases, GA ("fcs") for releases)
# 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,
@ -2289,6 +2289,13 @@ find $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir -- $suffix}/demo \
| sed 's|'$RPM_BUILD_ROOT'||' \ | sed 's|'$RPM_BUILD_ROOT'||' \
| sed 's|^|%doc |' \ | sed 's|^|%doc |' \
>> %{name}-demo.files"$suffix" >> %{name}-demo.files"$suffix"
# Find demo directories.
find $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir -- $suffix}/demo \
$RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir -- $suffix}/sample \
-type d | sort \
| sed 's|'$RPM_BUILD_ROOT'||' \
| sed 's|^|%dir |' \
>> %{name}-demo.files"$suffix"
# Create links which leads to separately installed java-atk-bridge and allow configuration # Create links which leads to separately installed java-atk-bridge and allow configuration
# links points to java-atk-wrapper - an dependence # links points to java-atk-wrapper - an dependence
@ -2595,6 +2602,9 @@ require "copy_jdk_configs.lua"
%endif %endif
%changelog %changelog
* Mon Jan 25 2021 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.282.b08-2
- Add directories to files directive for demo package.
* Sun Jan 24 2021 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.282.b08-1 * Sun Jan 24 2021 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.282.b08-1
- Use RSA as default for keytool, as DSA is disabled in all crypto policies except LEGACY - Use RSA as default for keytool, as DSA is disabled in all crypto policies except LEGACY