| |
@@ -208,7 +208,7 @@
|
| |
|
| |
# New Version-String scheme-style defines
|
| |
%global majorver 11
|
| |
- %global securityver 3
|
| |
+ %global securityver 4
|
| |
# buildjdkver is usually same as %%{majorver},
|
| |
# but in time of bootstrap of next jdk, it is majorver-1,
|
| |
# and this it is better to change it here, on single place
|
| |
@@ -224,13 +224,27 @@
|
| |
%global lts_designator ""
|
| |
%global lts_designator_zip ""
|
| |
%endif
|
| |
+ #
|
| |
+ # EA release support. Examples:
|
| |
+ #
|
| |
+ # EA release:
|
| |
+ # ea_designator ea
|
| |
+ # ea_designator_zip -%{ea_designator}
|
| |
+ # extraver .%{ea_designator}
|
| |
+ # GA release:
|
| |
+ # ea_designator ""
|
| |
+ # ea_designator_zip ""
|
| |
+ # extraver %{nil}
|
| |
+ %global ea_designator ea
|
| |
+ %global ea_designator_zip -%{ea_designator}
|
| |
+ %global extraver .%{ea_designator}
|
| |
|
| |
# Standard JPackage naming and versioning defines
|
| |
%global origin openjdk
|
| |
%global origin_nice OpenJDK
|
| |
%global top_level_dir_name %{origin}
|
| |
%global minorver 0
|
| |
- %global buildver 7
|
| |
+ %global buildver 8
|
| |
#%%global tagsuffix ""
|
| |
# priority must be 8 digits in total; untill openjdk 1.8 we were using 18..... so when moving to 11 we had to add another digit
|
| |
%if %is_system_jdk
|
| |
@@ -953,7 +967,10 @@
|
| |
|
| |
Name: java-%{javaver}-%{origin}
|
| |
Version: %{newjavaver}.%{buildver}
|
| |
- Release: 5%{?dist}
|
| |
+ # Use (where N is usually a number starting at 1):
|
| |
+ # - 0.N%%{?extraver}%%{?dist} for EA releases,
|
| |
+ # - N%%{?extraver}{?dist} for GA releases
|
| |
+ Release: 0.1%{?extraver}%{?dist}
|
| |
# java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons
|
| |
# and this change was brought into RHEL-4. java-1.5.0-ibm packages
|
| |
# also included the epoch in their virtual provides. This created a
|
| |
@@ -1396,7 +1413,7 @@
|
| |
--with-jobs=1 \
|
| |
%endif
|
| |
--with-version-build=%{buildver} \
|
| |
- --with-version-pre="" \
|
| |
+ --with-version-pre="%{ea_designator}" \
|
| |
--with-version-opt=%{lts_designator} \
|
| |
--with-vendor-version-string="%{vendor_version_string}" \
|
| |
--with-boot-jdk=/usr/lib/jvm/java-%{buildjdkver}-openjdk \
|
| |
@@ -1621,7 +1638,7 @@
|
| |
# Install Javadoc documentation
|
| |
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}
|
| |
cp -a %{buildoutputdir -- $suffix}/images/docs $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}
|
| |
- cp -a %{buildoutputdir -- $suffix}/bundles/jdk-%{newjavaver}+%{buildver}%{lts_designator_zip}-docs.zip $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}.zip
|
| |
+ cp -a %{buildoutputdir -- $suffix}/bundles/jdk-%{newjavaver}%{ea_designator_zip}+%{buildver}%{lts_designator_zip}-docs.zip $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}.zip
|
| |
fi
|
| |
|
| |
# Install icons and menu entries
|
| |
@@ -1834,6 +1851,10 @@
|
| |
|
| |
|
| |
%changelog
|
| |
+ * Fri Jun 21 2019 Severin Gehwolf <sgehwolf@redhat.com> - 1:11.0.4.8-0.1.ea
|
| |
+ - Update to 11.0.4+8 EA sources.
|
| |
+ - Include 'ea' designator in -version output.
|
| |
+
|
| |
* Tue May 14 2019 Severin Gehwolf <sgehwolf@redhat.com> - 1:11.0.3.7-5
|
| |
- Bump release for rebuild.
|
| |
|
| |
java -version
output appropriately identifies as such.This depends on:
https://src.fedoraproject.org/rpms/java-11-openjdk/pull-request/47