The package rpms/java-11-openjdk.git has added or updated architecture specific content in
its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/java-11-openjdk.git/commit/?id=ac....
Change:
+%ifarch %{share_arches}
Thanks.
Full change:
============
commit 0a9a1333c067c967ea370a27818a373985853dcd
Author: Jiri Vanek <jvanek(a)redhat.com>
Date: Tue Aug 31 17:42:49 2021 +0200
Fixed date
diff --git a/java-11-openjdk.spec b/java-11-openjdk.spec
index 556aa46..710cad3 100644
--- a/java-11-openjdk.spec
+++ b/java-11-openjdk.spec
@@ -2326,7 +2326,7 @@ cjc.mainProgram(args)
%endif
%changelog
-* Fri May 07 2021 Jiri Vanek <jvanek(a)redhat.com> - 1:11.0.12.0.7-3
+* Tue Aug 31 2021 Jiri Vanek <jvanek(a)redhat.com> - 1:11.0.12.0.7-3
- alternatives creation moved to posttrans
- Thus fixing the old reisntall issue:
-
https://bugzilla.redhat.com/show_bug.cgi?id=1200302
commit 708c867e3985cb4010b8f8b67003a7ebacd19612
Author: Jiri Vanek <jvanek(a)redhat.com>
Date: Tue Aug 31 16:50:08 2021 +0200
Bumped release to have set of two packages with posts change
diff --git a/java-11-openjdk.spec b/java-11-openjdk.spec
index 7e70edc..556aa46 100644
--- a/java-11-openjdk.spec
+++ b/java-11-openjdk.spec
@@ -343,7 +343,7 @@
%global top_level_dir_name %{origin}
%global top_level_dir_name_backup %{top_level_dir_name}-backup
%global buildver 7
-%global rpmrelease 3
+%global rpmrelease 4
#%%global tagsuffix ""
# 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
commit ac34479cd0bb218d13fb97c4331354400e720e0a
Author: Jiri Vanek <jvanek(a)redhat.com>
Date: Mon Aug 30 16:21:11 2021 +0200
alternatives creation moved to posttrans
Thus fixing the old reisntall issue:
https://bugzilla.redhat.com/show_bug.cgi?id=1200302
https://bugzilla.redhat.com/show_bug.cgi?id=1976053
diff --git a/java-11-openjdk.spec b/java-11-openjdk.spec
index a325081..7e70edc 100644
--- a/java-11-openjdk.spec
+++ b/java-11-openjdk.spec
@@ -77,7 +77,7 @@
# in alternatives those are slaves and master, very often triplicated by man pages
# in files all masters and slaves are ghosted
# the ghosts are here to allow installation via query like `dnf install /usr/bin/java`
-# you can list those files, with appropriate sections: cat *.spec | grep -e --install -e
--slave -e post_
+# you can list those files, with appropriate sections: cat *.spec | grep -e --install -e
--slave -e post_ -e alternatives
# TODO - fix those hardcoded lists via single list
# Those files must *NOT* be ghosted for *slowdebug* packages
# FIXME - if you are moving jshell or jlink or similar, always modify all three sections
@@ -343,7 +343,7 @@
%global top_level_dir_name %{origin}
%global top_level_dir_name_backup %{top_level_dir_name}-backup
%global buildver 7
-%global rpmrelease 2
+%global rpmrelease 3
#%%global tagsuffix ""
# 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
@@ -464,12 +464,7 @@ update-desktop-database %{_datadir}/applications &> /dev/null
|| :
exit 0
}
-
-%define post_headless() %{expand:
-%ifarch %{share_arches}
-%{jrebindir -- %{?1}}/java -Xshare:dump >/dev/null 2>/dev/null
-%endif
-
+%define alternatives_java_install() %{expand:
PRIORITY=%{priority}
if [ "%{?1}" == %{debug_suffix} ]; then
let PRIORITY=PRIORITY-1
@@ -507,8 +502,13 @@ for X in %{origin} %{javaver} ; do
alternatives --install %{_jvmdir}/jre-"$X" jre_"$X"
%{_jvmdir}/%{sdkdir -- %{?1}} $PRIORITY --family %{name}.%{_arch}
done
-update-alternatives --install %{_jvmdir}/jre-%{javaver}-%{origin}
jre_%{javaver}_%{origin} %{_jvmdir}/%{jrelnk -- %{?1}} $PRIORITY --family
%{name}.%{_arch}
+alternatives --install %{_jvmdir}/jre-%{javaver}-%{origin} jre_%{javaver}_%{origin}
%{_jvmdir}/%{jrelnk -- %{?1}} $PRIORITY --family %{name}.%{_arch}
+}
+%define post_headless() %{expand:
+%ifarch %{share_arches}
+%{jrebindir -- %{?1}}/java -Xshare:dump >/dev/null 2>/dev/null
+%endif
update-desktop-database %{_datadir}/applications &> /dev/null || :
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
@@ -545,8 +545,8 @@ exit 0
%{update_desktop_icons}
}
-%define post_devel() %{expand:
+%define alternatives_javac_install() %{expand:
PRIORITY=%{priority}
if [ "%{?1}" == %{debug_suffix} ]; then
let PRIORITY=PRIORITY-1
@@ -628,7 +628,9 @@ for X in %{origin} %{javaver} ; do
done
update-alternatives --install %{_jvmdir}/java-%{javaver}-%{origin}
java_sdk_%{javaver}_%{origin} %{_jvmdir}/%{sdkdir -- %{?1}} $PRIORITY --family
%{name}.%{_arch}
+}
+%define post_devel() %{expand:
update-desktop-database %{_datadir}/applications &> /dev/null || :
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
@@ -651,11 +653,11 @@ exit 0
}
%define posttrans_devel() %{expand:
+%{alternatives_javac_install -- %{?1}}
%{update_desktop_icons}
}
-%define post_javadoc() %{expand:
-
+%define alternatives_javadoc_install() %{expand:
PRIORITY=%{priority}
if [ "%{?1}" == %{debug_suffix} ]; then
let PRIORITY=PRIORITY-1
@@ -672,8 +674,7 @@ exit 0
exit 0
}
-%define post_javadoc_zip() %{expand:
-
+%define alternatives_javadoczip_install() %{expand:
PRIORITY=%{priority}
if [ "%{?1}" == %{debug_suffix} ]; then
let PRIORITY=PRIORITY-1
@@ -2146,6 +2147,9 @@ cjc.mainProgram(args)
%posttrans
%{posttrans_script %{nil}}
+%posttrans headless
+%{alternatives_java_install %{nil}}
+
%post devel
%{post_devel %{nil}}
@@ -2155,14 +2159,14 @@ cjc.mainProgram(args)
%posttrans devel
%{posttrans_devel %{nil}}
-%post javadoc
-%{post_javadoc %{nil}}
+%posttrans javadoc
+%{alternatives_javadoc_install %{nil}}
%postun javadoc
%{postun_javadoc %{nil}}
-%post javadoc-zip
-%{post_javadoc_zip %{nil}}
+%posttrans javadoc-zip
+%{alternatives_javadoczip_install %{nil}}
%postun javadoc-zip
%{postun_javadoc_zip %{nil}}
@@ -2175,6 +2179,9 @@ cjc.mainProgram(args)
%post headless-slowdebug
%{post_headless -- %{debug_suffix_unquoted}}
+%posttrans headless-slowdebug
+%{alternatives_java_install -- %{debug_suffix_unquoted}}
+
%postun slowdebug
%{postun_script -- %{debug_suffix_unquoted}}
@@ -2210,6 +2217,9 @@ cjc.mainProgram(args)
%posttrans fastdebug
%{posttrans_script -- %{fastdebug_suffix_unquoted}}
+%posttrans headless-fastdebug
+%{alternatives_java_install -- %{fastdebug_suffix_unquoted}}
+
%post devel-fastdebug
%{post_devel -- %{fastdebug_suffix_unquoted}}
@@ -2316,6 +2326,12 @@ cjc.mainProgram(args)
%endif
%changelog
+* Fri May 07 2021 Jiri Vanek <jvanek(a)redhat.com> - 1:11.0.12.0.7-3
+- alternatives creation moved to posttrans
+- Thus fixing the old reisntall issue:
+-
https://bugzilla.redhat.com/show_bug.cgi?id=1200302
+-
https://bugzilla.redhat.com/show_bug.cgi?id=1976053
+
* Mon Aug 09 2021 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:11.0.12.0.7-2
- Remove non-Free test from source tarball.
commit 7337c666ec6da0e27afaf1f6ebf766135d50e2ff
Author: Andrew Hughes <gnu.andrew(a)redhat.com>
Date: Mon Aug 9 02:09:38 2021 +0100
Remove non-Free test from source tarball.
diff --git a/.gitignore b/.gitignore
index 0552c5f..c5224a8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -92,3 +92,4 @@
/jdk-updates-jdk11u-jdk-11.0.12+4-4curve.tar.xz
/jdk-updates-jdk11u-jdk-11.0.12+6-4curve.tar.xz
/jdk-updates-jdk11u-jdk-11.0.12+7-4curve.tar.xz
+/jdk-updates-jdk11u-jdk-11.0.12+7-4curve-clean.tar.xz
diff --git a/generate_source_tarball.sh b/generate_source_tarball.sh
index 9baaf2c..d8c729b 100755
--- a/generate_source_tarball.sh
+++ b/generate_source_tarball.sh
@@ -94,12 +94,22 @@ if [ "x$REPO_ROOT" = "x" ] ; then
REPO_ROOT="${OPENJDK_URL}/${PROJECT_NAME}/${REPO_NAME}"
echo "No repository root specified; default to ${REPO_ROOT}"
fi;
-
if [ "x$TO_COMPRESS" = "x" ] ; then
TO_COMPRESS="openjdk"
echo "No to be compressed targets specified, ; default to ${TO_COMPRESS}"
fi;
+echo -e "Settings:"
+echo -e "\tVERSION: ${VERSION}"
+echo -e "\tPROJECT_NAME: ${PROJECT_NAME}"
+echo -e "\tREPO_NAME: ${REPO_NAME}"
+echo -e "\tOPENJDK_URL: ${OPENJDK_URL}"
+echo -e "\tCOMPRESSION: ${COMPRESSION}"
+echo -e "\tFILE_NAME_ROOT: ${FILE_NAME_ROOT}"
+echo -e "\tREPO_ROOT: ${REPO_ROOT}"
+echo -e "\tTO_COMPRESS: ${TO_COMPRESS}"
+echo -e "\tPRTBC01: ${PRTBC01}"
+
if [ -d ${FILE_NAME_ROOT} ] ; then
echo "exists exists exists exists exists exists exists "
echo "reusing reusing reusing reusing reusing reusing "
@@ -112,6 +122,11 @@ else
popd
fi
pushd "${FILE_NAME_ROOT}"
+# UnderlineTaglet.java has a BSD license with a field-of-use restriction, making it
non-Free
+ if [ -d openjdk/test ] ; then
+ echo "Removing langtools test case with non-Free license"
+ rm -vf openjdk/test/langtools/tools/javadoc/api/basic/taglets/UnderlineTaglet.java
+ fi
if [ -d openjdk/src ]; then
pushd openjdk
echo "Removing EC source code we don't build"
@@ -148,7 +163,7 @@ pushd "${FILE_NAME_ROOT}"
else
SWITCH=czf
fi
- TARBALL_NAME=${FILE_NAME_ROOT}-4curve.tar.${COMPRESSION}
+ TARBALL_NAME=${FILE_NAME_ROOT}-4curve-clean.tar.${COMPRESSION}
tar --exclude-vcs -$SWITCH ${TARBALL_NAME} $TO_COMPRESS
mv ${TARBALL_NAME} ..
popd
diff --git a/java-11-openjdk.spec b/java-11-openjdk.spec
index c59be35..a325081 100644
--- a/java-11-openjdk.spec
+++ b/java-11-openjdk.spec
@@ -343,7 +343,7 @@
%global top_level_dir_name %{origin}
%global top_level_dir_name_backup %{top_level_dir_name}-backup
%global buildver 7
-%global rpmrelease 1
+%global rpmrelease 2
#%%global tagsuffix ""
# 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
@@ -1158,7 +1158,7 @@ URL:
http://openjdk.java.net/
# to regenerate source0 (jdk) run update_package.sh
# update_package.sh contains hard-coded repos, revisions, tags, and projects to
regenerate the source archives
-Source0:
jdk-updates-jdk%{featurever}u-jdk-%{filever}+%{buildver}%{?tagsuffix:-%{tagsuffix}}-4curve.tar.xz
+Source0:
jdk-updates-jdk%{featurever}u-jdk-%{filever}+%{buildver}%{?tagsuffix:-%{tagsuffix}}-4curve-clean.tar.xz
# Use 'icedtea_sync.sh' to update the following
# They are based on code contained in the IcedTea project (6.x).
@@ -2316,6 +2316,9 @@ cjc.mainProgram(args)
%endif
%changelog
+* Mon Aug 09 2021 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:11.0.12.0.7-2
+- Remove non-Free test from source tarball.
+
* Wed Jul 28 2021 Severin Gehwolf <sgehwolf(a)redhat.com> - 1:11.0.12.0.7-1
- Add patch in order to fix java.library.path issue on aarch64 (JDK-8269668)
- Resolves: rhbz#1977671
diff --git a/sources b/sources
index 5132871..e12eab2 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
SHA512 (tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz) =
97d026212363b3c83f6a04100ad7f6fdde833d16579717f8756e2b8c2eb70e144a41a330cb9ccde9c3badd37a2d54fdf4650a950ec21d8b686d545ecb2a64d30
-SHA512 (jdk-updates-jdk11u-jdk-11.0.12+7-4curve.tar.xz) =
6a4d083ed9250730f701a4de4af929017cedfdc09015b378519a4e782f9c9771fbb5686e654044b8dceee5962abbacf5af071b277b1584dc27b430f2d60fdc12
+SHA512 (jdk-updates-jdk11u-jdk-11.0.12+7-4curve-clean.tar.xz) =
c7180055ef449f2218618049a55fb44ddf4d353d8b32714f092c326387d5e29b49b42e2df2802e01549b086499ade8417e8d0e1b057aa954272072a2c0669151
commit 5ff37f627fdb3e55d7e8a44fb9d97fbc6039c510
Author: Severin Gehwolf <sgehwolf(a)redhat.com>
Date: Wed Jul 14 12:25:49 2021 +0200
Fix java.library.path issue on aarch64 (JDK-8269668)
Resolves: rhbz#1977671
diff --git a/java-11-openjdk.spec b/java-11-openjdk.spec
index aa0e9f9..c59be35 100644
--- a/java-11-openjdk.spec
+++ b/java-11-openjdk.spec
@@ -343,7 +343,7 @@
%global top_level_dir_name %{origin}
%global top_level_dir_name_backup %{top_level_dir_name}-backup
%global buildver 7
-%global rpmrelease 0
+%global rpmrelease 1
#%%global tagsuffix ""
# 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
@@ -1124,7 +1124,7 @@ Provides: java-%{origin}-src%{?1} = %{epoch}:%{version}-%{release}
Name: java-%{javaver}-%{origin}
Version: %{newjavaver}.%{buildver}
-Release: %{?eaprefix}%{rpmrelease}%{?extraver}%{?dist}.1
+Release: %{?eaprefix}%{rpmrelease}%{?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
@@ -1246,13 +1246,15 @@ Patch7: pr3695-toggle_system_crypto_policy.patch
#############################################
#
-# Patches appearing in 11.0.10
+# Patches appearing in 11.0.13
#
# This section includes patches which are present
# in the listed OpenJDK 11u release and should be
# able to be removed once that release is out
# and used by this RPM.
#############################################
+# JDK-8269668, RH1977671: [aarch64] java.library.path not including /usr/lib64
+Patch8: jdk8269668-rh1977671-aarch64_lib_path_fix.patch
BuildRequires: autoconf
BuildRequires: automake
@@ -1605,6 +1607,7 @@ pushd %{top_level_dir_name}
%patch3 -p1
%patch4 -p1
%patch7 -p1
+%patch8 -p1
popd # openjdk
%patch1000
@@ -2313,6 +2316,10 @@ cjc.mainProgram(args)
%endif
%changelog
+* Wed Jul 28 2021 Severin Gehwolf <sgehwolf(a)redhat.com> - 1:11.0.12.0.7-1
+- Add patch in order to fix java.library.path issue on aarch64 (JDK-8269668)
+- Resolves: rhbz#1977671
+
* Thu Jul 22 2021 Fedora Release Engineering <releng(a)fedoraproject.org> -
1:11.0.12.0.7-0.1
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
diff --git a/jdk8269668-rh1977671-aarch64_lib_path_fix.patch
b/jdk8269668-rh1977671-aarch64_lib_path_fix.patch
new file mode 100644
index 0000000..ddf686c
--- /dev/null
+++ b/jdk8269668-rh1977671-aarch64_lib_path_fix.patch
@@ -0,0 +1,32 @@
+From ec03fdb752f2dc0833784a6877a4c232a8cdd9d2 Mon Sep 17 00:00:00 2001
+From: Severin Gehwolf <sgehwolf(a)redhat.com>
+Date: Wed, 14 Jul 2021 12:06:39 +0200
+Subject: [PATCH] Backport e14801cdd9b108aa4ca47d0bc1dc67fca575764c
+
+---
+ src/hotspot/os/linux/os_linux.cpp | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp
+index e8baf704e3a..12b75b733b5 100644
+--- a/src/hotspot/os/linux/os_linux.cpp
++++ b/src/hotspot/os/linux/os_linux.cpp
+@@ -413,8 +413,15 @@ void os::init_system_properties_values() {
+ // 7: The default directories, normally /lib and /usr/lib.
+ #if defined(AMD64) || (defined(_LP64) && defined(SPARC)) || defined(PPC64) ||
defined(S390)
+ #define DEFAULT_LIBPATH "/usr/lib64:/lib64:/lib:/usr/lib"
++#else
++#if defined(AARCH64)
++ // Use 32-bit locations first for AARCH64 (a 64-bit architecture), since some systems
++ // might not adhere to the FHS and it would be a change in behaviour if we used
++ // DEFAULT_LIBPATH of other 64-bit architectures which prefer the 64-bit paths.
++ #define DEFAULT_LIBPATH "/lib:/usr/lib:/usr/lib64:/lib64"
+ #else
+ #define DEFAULT_LIBPATH "/lib:/usr/lib"
++#endif // AARCH64
+ #endif
+
+ // Base path of extensions installed on the system.
+--
+2.31.1
+
commit 58ae94a447c7b06f925a2e47c82099459f00b376
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Jul 22 08:56:53 2021 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/java-11-openjdk.spec b/java-11-openjdk.spec
index 5780fd3..aa0e9f9 100644
--- a/java-11-openjdk.spec
+++ b/java-11-openjdk.spec
@@ -1124,7 +1124,7 @@ Provides: java-%{origin}-src%{?1} = %{epoch}:%{version}-%{release}
Name: java-%{javaver}-%{origin}
Version: %{newjavaver}.%{buildver}
-Release: %{?eaprefix}%{rpmrelease}%{?extraver}%{?dist}
+Release: %{?eaprefix}%{rpmrelease}%{?extraver}%{?dist}.1
# 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
@@ -2313,6 +2313,9 @@ cjc.mainProgram(args)
%endif
%changelog
+* Thu Jul 22 2021 Fedora Release Engineering <releng(a)fedoraproject.org> -
1:11.0.12.0.7-0.1
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
* Tue Jul 13 2021 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:11.0.12.0.7-0
- Update to jdk-11.0.12.0+7
- Update release notes to 11.0.12.0+7