rpms/java-openjdk
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Aligned with rawhide, rawhide do nto buit, but issue si suspiced somewhere else:

Browse Source 
+ install -d -m 755 /builddir/build/BUILDROOT/java-openjdk-10.0.1.10-6.fc29.x86_64/usr/share/applications /builddir/build/BUILDROOT/java-openjdk-10.0.1.10-6.fc29.x86_64/usr/share/pixmaps
+ for e in jconsole$suffix
+ desktop-file-install --vendor=java-10-openjdk-10.0.1.10-6.fc29.x86_64 --mode=644 --dir=/builddir/build/BUILDROOT/java-openjdk-10.0.1.10-6.fc29.x86_64/usr/share/applications jconsole.desktop
/builddir/build/BUILDROOT/java-openjdk-10.0.1.10-6.fc29.x86_64/usr/share/applications/java-10-openjdk-10.0.1.10-6.fc29.x86_64-jconsole.desktop: error: value "%{_jvmdir}/java-10-openjdk-10.0.1.10-6.fc29.x86_64/bin/jconsole" for key "Exec" in group "Desktop Entry" contains an invalid field code "%{"
Error on file "jconsole.desktop": Failed to validate the created desktop file
This commit is contained in:
Jiri 2018-06-02 09:47:19 +02:00
parent c9057002d7
commit 4086d87f7f
1 changed files with 39 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
java-openjdk.spec
View File

@ -94,6 +94,10 @@
%global __provides_exclude ^(%{_privatelibs})$
%global __requires_exclude ^(%{_privatelibs})$
# In some cases, the arch used by the JDK does
# not match _arch.
# Also, in some cases, the machine name used by SystemTap
# does not match that given by _build_cpu
%ifarch x86_64
%global archinstall amd64
%endif
@ -718,8 +722,8 @@ Provides: java%{?1} = %{epoch}:%{javaver}
%define java_headless_rpo() %{expand:
# Require /etc/pki/java/cacerts
Requires: ca-certificates
# Require javapackages-tools for ownership of /usr/lib/jvm/
Requires: javapackages-tools
# Require javapackages-filesystem for ownership of /usr/lib/jvm/
Requires: javapackages-filesystem
# Require zoneinfo data provided by tzdata-java sub-package
Requires: tzdata-java >= 2015d
# libsctp.so.1 is being `dlopen`ed on demand
@ -834,7 +838,7 @@ Provides: java-%{javaver}-%{origin}-src%{?1} = %{epoch}:%{version}-%{release}
Name: java-%{origin}
Version: %{newjavaver}.%{buildver}
Release: 4%{?dist}
Release: 6%{?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
@ -849,7 +853,17 @@ Epoch: 1
Summary: %{origin_nice} Runtime Environment %{majorver}
Group: Development/Languages
License: ASL 1.1 and ASL 2.0 and GPL+ and GPLv2 and GPLv2 with exceptions and GPL+ and LGPLv2 and MPLv1.0 and MPLv1.1 and Public Domain and W3C
# HotSpot code is licensed under GPLv2
# JDK library code is licensed under GPLv2 with the Classpath exception
# The Apache license is used in code taken from Apache projects (primarily JAXP & JAXWS)
# DOM levels 2 & 3 and the XML digital signature schemas are licensed under the W3C Software License
# The JSR166 concurrency code is in the public domain
# The BSD and MIT licenses are used for a number of third-party libraries (see THIRD_PARTY_README)
# The OpenJDK source tree includes the JPEG library (IJG), zlib & libpng (zlib), giflib and LCMS (MIT)
# The test code includes copies of NSS under the Mozilla Public License v2.0
# The PCSClite headers are under a BSD with advertising license
# The elliptic curve cryptography (ECC) source code is licensed under the LGPLv2.1 or any later version
License: ASL 1.1 and ASL 2.0 and BSD and BSD with advertising and GPL+ and GPLv2 and GPLv2 with exceptions and IJG and LGPLv2+ and MIT and MPLv2.0 and Public Domain and W3C and zlib
URL: http://openjdk.java.net/
Source0: jdk-updates-jdk%{majorver}u-jdk-%{newjavaver}+%{buildver}.tar.xz
@ -954,7 +968,7 @@ BuildRequires: nss-devel
BuildRequires: pkgconfig
BuildRequires: xorg-x11-proto-devel
BuildRequires: zip
BuildRequires: java-9-openjdk-devel
BuildRequires: java-openjdk-devel
# Zero-assembler build requirement
%ifnarch %{jit_arches}
BuildRequires: libffi-devel
@ -1105,7 +1119,7 @@ The java-%{origin}-src-debug sub-package contains the complete %{origin_nice} %{
%package javadoc
Summary: %{origin_nice} %{majorver} API documentation
Group: Documentation
Requires: javapackages-tools
Requires: javapackages-filesystem
%{java_javadoc_rpo %{nil}}
@ -1117,7 +1131,7 @@ The %{origin_nice} %{majorver} API documentation.
%package javadoc-zip
Summary: %{origin_nice} %{majorver} API documentation compressed in single archive
Group: Documentation
Requires: javapackages-tools
Requires: javapackages-filesystem
%{java_javadoc_rpo %{nil}}
@ -1129,7 +1143,7 @@ The %{origin_nice} %{majorver} API documentation compressed in single archive.
%package javadoc-slowdebug
Summary: %{origin_nice} %{majorver} API documentation %{for_debug}
Group: Documentation
Requires: javapackages-tools
Requires: javapackages-filesystem
%{java_javadoc_rpo -- %{debug_suffix_unquoted}}
@ -1141,7 +1155,7 @@ The %{origin_nice} %{majorver} API documentation %{for_debug}.
%package javadoc-zip-slowdebug
Summary: %{origin_nice} %{majorver} API documentation compressed in single archive %{for_debug}
Group: Documentation
Requires: javapackages-tools
Requires: javapackages-filesystem
%{java_javadoc_rpo -- %{debug_suffix_unquoted}}
@ -1259,6 +1273,9 @@ export ARCH_DATA_MODEL=64
export CFLAGS="$CFLAGS -mieee"
%endif
# We use ourcppflags because the OpenJDK build seems to
# pass EXTRA_CFLAGS to the HotSpot C++ compiler...
# Explicitly set the C++ standard as the default has changed on GCC >= 6
EXTRA_CFLAGS="%ourcppflags -std=gnu++98 -Wno-error -fno-delete-null-pointer-checks -fno-lifetime-dse"
EXTRA_CPP_FLAGS="%ourcppflags -std=gnu++98 -fno-delete-null-pointer-checks -fno-lifetime-dse"
@ -1266,6 +1283,7 @@ EXTRA_CPP_FLAGS="%ourcppflags -std=gnu++98 -fno-delete-null-pointer-checks -fno-
# fix rpmlint warnings
EXTRA_CFLAGS="$EXTRA_CFLAGS -fno-strict-aliasing"
%endif
export EXTRA_CFLAGS
(cd %{top_level_dir_name}/make/autoconf
bash ./autogen.sh
@ -1292,7 +1310,7 @@ bash ../configure \
--with-version-build=%{buildver} \
--with-version-pre="" \
--with-version-opt="" \
--with-boot-jdk=/usr/lib/jvm/java-9-openjdk \
--with-boot-jdk=/usr/lib/jvm/java-%{majorver}-openjdk \
--with-debug-level=$debugbuild \
--with-native-debug-symbols=internal \
--enable-unlimited-crypto \
@ -1336,7 +1354,7 @@ find images/%{jdkimage}/bin/ -exec chmod +x {} \;
popd >& /dev/null
# Install nss.cfg right away as we will be using the JRE above
export JAVA_HOME=$(pwd)/%{buildoutputdir $suffix}/images/%{jdkimage}
export JAVA_HOME=$(pwd)/%{buildoutputdir -- $suffix}/images/%{jdkimage}
# Install nss.cfg right away as we will be using the JRE above
install -m 644 nss.cfg $JAVA_HOME/conf/security/
@ -1353,7 +1371,7 @@ done
# We test debug first as it will give better diagnostics on a crash
for suffix in %{rev_build_loop} ; do
export JAVA_HOME=$(pwd)/%{buildoutputdir $suffix}/images/%{jdkimage}
export JAVA_HOME=$(pwd)/%{buildoutputdir -- $suffix}/images/%{jdkimage}
# Check unlimited policy has been used
$JAVA_HOME/bin/javac -d . %{SOURCE13}
@ -1408,6 +1426,11 @@ do
done
# Make sure gdb can do a backtrace based on line numbers on libjvm.so
# javaCalls.cpp:58 should map to:
# http://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/file/ff3b27e6bcc2/src/share/vm/runtime/javaCalls.cpp#l58
# Using line number 1 might cause build problems. See:
# https://bugzilla.redhat.com/show_bug.cgi?id=1539664
# https://bugzilla.redhat.com/show_bug.cgi?id=1538767
gdb -q "$JAVA_HOME/bin/java" <<EOF | tee gdb.out
handle SIGSEGV pass nostop noprint
handle SIGILL pass nostop noprint
@ -1744,6 +1767,10 @@ require "copy_jdk_configs.lua"
%changelog
* Thu May 17 2018 Severin Gehwolf <sgehwolf@redhat.com> - 1:10.0.1.10-5
- Move to javapackages-filesystem for directory ownership.
Resolves RHBZ#1500288
* Mon Apr 30 2018 Severin Gehwolf <sgehwolf@redhat.com> - 1:10.0.1.10-4
- Add JDK-8193802-npe-jar-getVersionMap.patch so as to fix
RHBZ#1557375.