#48 Introduce EA designator and package EA sources
Closed 4 years ago by jerboaa. Opened 4 years ago by jerboaa.
rpms/ jerboaa/java-11-openjdk introduce_ea_designator  into  master

Update to EA version 11.0.4+8
Severin Gehwolf • 4 years ago  
file modified
+1
@@ -8,3 +8,4 @@ 

  /shenandoah-jdk11-shenandoah-jdk-11.0.2+7.tar.xz

  /shenandoah-jdk11-shenandoah-jdk-11.0.3+6.tar.xz

  /shenandoah-jdk11-shenandoah-jdk-11.0.3+7.tar.xz

+ /shenandoah-jdk11-shenandoah-jdk-11.0.4+8.tar.xz

file modified
+26 -5
@@ -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.

  

file modified
+1 -1
@@ -1,2 +1,2 @@ 

  SHA512 (systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz) = cf578221b77d8c7e019f69909bc86c419c5fb5e10bceba9592ff6e7f96887b0a7f07c9cefe90800975247a078785ca190fdec5c2d0f841bb447cee784b570f7d

- SHA512 (shenandoah-jdk11-shenandoah-jdk-11.0.3+7.tar.xz) = 9320f1301cd2237dabaa4de0e94015639969bf316e8bb3cdfd317b72209ddf9f5dca5f4a56aee3e136c0b22c507e43aee7d52419ff6ab704717365b669473703

+ SHA512 (shenandoah-jdk11-shenandoah-jdk-11.0.4+8.tar.xz) = 5abf003b9789f04c5decb81b321b13e940f7591437af21472b1547c6e88f2e6184a3d27ebf747274224d23cece99070124b535eaf95f5fd500bc6c88e475bc54

file modified
+1 -1
@@ -35,7 +35,7 @@ 

  export PROJECT_NAME="shenandoah"

  export REPO_NAME="jdk11"

  # warning, clonning without shenadnaoh prefix, you will clone pure jdk - thus without shenandaoh GC

- export VERSION="shenandoah-jdk-11.0.3+7"

+ export VERSION="shenandoah-jdk-11.0.4+8"

  export COMPRESSION=xz

  # unset tapsets overrides

  export OPENJDK_URL=""

This depends on:
https://src.fedoraproject.org/rpms/java-11-openjdk/pull-request/47

I've separated out the versioning changes and combined them with the similar work I did on OpenJDK 8. This is used in the latest RHEL builds of java-11-openjdk and backported to Fedora here: https://src.fedoraproject.org/rpms/java-11-openjdk/pull-request/49

rebased onto 37ac341

4 years ago

Pull-Request has been closed by jerboaa

4 years ago