rpms / java-latest-openjdk

Clone
Source Code
GIT

#13 Added --with-vendor id and url family of switches
Merged 3 years ago by jvanek. Opened 3 years ago by jvanek.
Unknown source master  into  master

file modified
+26 -1 
@@ -219,7 +219,7 @@
 

  %global top_level_dir_name   %{origin}
 

  %global minorver        0
 

  %global buildver        36
 

- %global rpmrelease      3
 

+ %global rpmrelease      4
 

  # 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
 

  %global priority %( printf '%02d%02d%02d%02d' %{majorver} %{minorver} %{securityver} %{buildver} )
 
@@ -248,6 +248,23 @@
 

  %global eaprefix 0.
 

  %endif
 

  

+ # Define what url should JVM offer in case of a crash report
 

+ # order may be important, epel may have rhel declared
 

+ %if 0%{?epel}
 

+ %global bugs  https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora%20EPEL&component=%{name}&version=epel%{epel}
 

+ %else
 

+ %if 0%{?fedora}
 

+ # Does not work for rawhide, keeps the version field empty
 

+ %global bugs  https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora&component=%{name}&version=%{fedora}
 

+ %else
 

+ %if 0%{?rhel}
 

+ %global bugs  https://bugzilla.redhat.com/enter_bug.cgi?product=Red%20Hat%20Enterprise%20Linux%20%{rhel}&component=%{name}
 

+ %else
 

+ %global bugs  https://bugzilla.redhat.com/enter_bug.cgi
 

+ %endif
 

+ %endif
 

+ %endif
 

+ 

  # parametrized macros are order-sensitive
 

  %global compatiblename  java-%{majorver}-%{origin}
 

  %global fullversion     %{compatiblename}-%{version}-%{release}
 
@@ -1373,6 +1390,10 @@
 

      --with-version-pre="%{ea_designator}"\
 

      --with-version-opt=%{lts_designator} \
 

      --with-vendor-version-string="%{vendor_version_string}" \
 

+     --with-vendor-name="Red Hat, Inc" \
 

+     --with-vendor-url="https://www.redhat.com/" \
 

+     --with-vendor-bug-url="%{bugs}" \
 

+     --with-vendor-vm-bug-url="%{bugs}" \
 

      --with-boot-jdk=/usr/lib/jvm/java-%{buildjdkver}-openjdk \
 

      --with-debug-level=$debugbuild \
 

      --with-native-debug-symbols=internal \
 
@@ -1812,6 +1833,10 @@
 

  

  

  %changelog
 

+ * Wed Apr 08 2020 Jiri Vanek <jvanek@redhat.com> - 1:14.0.0.36-4.rolling
 

+ - set vendor property and vendor urls
 

+ - made urls to be preconfigured by os
 

+ 

  * Tue Mar 24 2020 Petra Alice Mikova <pmikova@redhat.com> - 1:14.0.0.36-3.rolling
 

  - Remove s390x workaround flags for GCC 10
 

  - bump buildjdkver to 14

no initial comment

Changes look ok, but needs a Changelog entry.

Yup. I have not even bumped release. As those two are really messing up in merging. Thanx!
The scratch failed, becasue there is still 13 as boot jdk, whch is no longer true for rawhide.
Will wait for Petra Alice with it.

rebased onto ca138ce95bfa9a0a2e51d795a80e32c9dda0e488
3 years ago

Added preselected components/versions by os

Metadata Update from @jvanek:
- Request assigned
3 years ago

Define what url should JVM offer in case of a crash report

Does not work for rawhide, keep the version field empty

rebased onto 3789ed39eddff705da222b49b17cb978a069f24e
3 years ago

rebased onto 1b341281b5db0ef1cc30dd799357bf06c6b67bb4
3 years ago

rebased, fixed and added changelog and bumped release. Will merge tomorrow. TY!

rebased onto 9d47beb
3 years ago

Looks good to me.

LGTM

Pull-Request has been merged by jvanek
3 years ago

hmmm

  • /usr/bin/mkdir -p /builddir/build/BUILD/java-14-openjdk-14.0.0.36-4.rolling.fc33.x86_64/openjdk/build/support/native/java.management/libmanagement/
    gmake[2]: [make/Main.gmk:237: java.base-launchers] Error 2
    gmake[2]:     Waiting for unfinished jobs....
    SetupJdkExecutable BUILD_LAUNCHER_java
    [2] NAME := java

could it really break the build?

Belive it or not, its a comma in

--with-vendor-name="Red Hat, Inc" \

What is making the build to fail. Any thoughts before I remove it?

It is visibel here:

[5] CFLAGS := -I/builddir/build/BUILD/java-14-openjdk-14.0.0.36-4.rolling.fc33.x86_64/openjdk/build/support/modules_include/java.base -I/builddir/build/BUILD/java-14-openjdk-14.0.0.36-4.rolling.fc33.x86_64/openjdk/build/support/modules_include/java.base/linux -I/builddir/build/BUILD/java-14-openjdk-14.0.0.36-4.rolling.fc33.x86_64/openjdk/src/java.base/share/native/libjava -I/builddir/build/BUILD/java-14-openjdk-14.0.0.36-4.rolling.fc33.x86_64/openjdk/src/java.base/unix/native/libjava -I/builddir/build/BUILD/java-14-openjdk-14.0.0.36-4.rolling.fc33.x86_64/openjdk/src/hotspot/share/include -I/builddir/build/BUILD/java-14-openjdk-14.0.0.36-4.rolling.fc33.x86_64/openjdk/src/hotspot/os/posix/include -pipe -fstack-protector -D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE -DLINUX -DNDEBUG -fmacro-prefix-map=/= -std=c99 -fno-strict-aliasing -Wall -Wextra -Wformat=2 -Wpointer-arith -Wsign-compare -Wunused-function -Wundef -Wunused-value -Wreturn-type -Wtrampolines -m64 -g -pipe -Wformat -Wno-cpp -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fstack-protector-strong -grecord-gcc-switches -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -std=gnu++98 -Wno-error -fno-delete-null-pointer-checks -fno-lifetime-dse -fcommon -D_LITTLE_ENDIAN -DARCH='"amd64"' -Damd64 -D_LP64=1 -fno-omit-frame-pointer -fvisibility=hidden -I/builddir/build/BUILD/java-14-openjdk-14.0.0.36-4.rolling.fc33.x86_64/openjdk/src/java.base/share/native/launcher -I/builddir/build/BUILD/java-14-openjdk-14.0.0.36-4.rolling.fc33.x86_64/openjdk/src/java.base/share/native/libjli -I/builddir/build/BUILD/java-14-openjdk-14.0.0.36-4.rolling.fc33.x86_64/openjdk/src/java.base/unix/native/libjli -I/builddir/build/BUILD/java-14-openjdk-14.0.0.36-4.rolling.fc33.x86_64/openjdk/src/java.base/linux/native/libjli -DVERSION_FEATURE=14 -DVERSION_INTERIM=0 -DVERSION_UPDATE=0 -DVERSION_PATCH=0 -DVERSION_EXTRA1=0 -DVERSION_EXTRA2=0 -DVERSION_EXTRA3=0 -DVERSION_PRE='""' -DVERSION_BUILD=36 -DVERSION_OPT='""' -DVERSION_NUMBER='"14"' -DVERSION_STRING='"14+36"' -DVERSION_SHORT='"14"' -DVERSION_SPECIFICATION='"14"' -DVERSION_DATE='"2020-03-17"' -DVENDOR_VERSION_STRING='"19.9"' -DVERSION_CLASSFILE_MAJOR=58 -DVERSION_CLASSFILE_MINOR=0 -DVENDOR='"Red Hat  
 [6] Inc"' -DVENDOR_URL='"https://www.redhat.com/"' -DVENDOR_URL_BUG='"https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora&component=java-latest-openjdk&version=33"' -DVENDOR_URL_VM_BUG='"https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora&component=java-latest-openjdk&version=33"' -DLAUNCHER_NAME='"openjdk"' -DPROGNAME='"java"' -DEXPAND_CLASSPATH_WILDCARDS -DENABLE_ARG_FILES -DJAVA_ARGS='{ "-J-ms8m", }'  
 [7] CFLAGS_linux := -fPIC

See the redundant new line
Edited 3 years ago by jvanek

in
-DVERSION_CLASSFILE_MINOR=0 -DVENDOR='"Red Hat
[6] Inc"' -DVENDOR_URL='"https://www.redhat.com/"'

Did you not test it before posting? I guess we should start requiring a scratch build :P
I guess it needs to be "Red Hat$(COMMA)Inc." by the sound of it.

Uhm, each PR usually gets a scratch build (see simple-koji-ci) and every scratch build in here failed. Just sayin' ;-)
Changes Summary 1
+26 -1
file changed
java-latest-openjdk.spec
Powered by Pagure 5.13.3
Documentation • File an Issue • About this Instance • SSH Hostkey/Fingerprint
© Red Hat, Inc. and others.