From 609807750fa6ade278615d577524712ef597ef4d Mon Sep 17 00:00:00 2001 From: Petra Mikova Date: Mon, 22 May 2023 14:28:12 +0200 Subject: [PATCH 1/8] Fix macros to apply also to epel, lower buildjdkver --- java-latest-openjdk-portable.spec | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/java-latest-openjdk-portable.spec b/java-latest-openjdk-portable.spec index a1153c8..998e3b8 100644 --- a/java-latest-openjdk-portable.spec +++ b/java-latest-openjdk-portable.spec @@ -338,7 +338,7 @@ # buildjdkver is usually same as %%{featurever}, # but in time of bootstrap of next jdk, it is featurever-1, # and this it is better to change it here, on single place -%global buildjdkver %{featurever} +%global buildjdkver 19 # We don't add any LTS designator for STS packages (Fedora and EPEL). # We need to explicitly exclude EPEL as it would have the %%{rhel} macro defined. %if 0%{?rhel} && !0%{?epel} @@ -391,7 +391,7 @@ %global top_level_dir_name %{origin} %global top_level_dir_name_backup %{top_level_dir_name}-backup %global buildver 9 -%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 # Using 10 digits may overflow the int used for priority, so we combine the patch and build versions @@ -456,10 +456,10 @@ %define jdkportablesourcesnameimpl() %(echo %{uniquesuffix ""} | sed "s;el7\\(_[0-9]\\)*;portable%{1}.sources.;g" | sed "s;openjdkportable;el;g" | sed "s;.%{_arch};.noarch;g") %define staticlibsportablenameimpl() %(echo %{uniquesuffix ""} | sed "s;el7\\(_[0-9]\\)*;portable%{1}.static-libs.;g" | sed "s;openjdkportable;el;g") %else -%define jreportablenameimpl() %(echo %{uniquesuffix ""} | sed "s;fc\\([0-9]\\)*;\\0.portable%{1}.jre;g" | sed "s;openjdkportable;el;g") -%define jdkportablenameimpl() %(echo %{uniquesuffix ""} | sed "s;fc\\([0-9]\\)*;\\0.portable%{1}.jdk;g" | sed "s;openjdkportable;el;g") -%define jdkportablesourcesnameimpl() %(echo %{uniquesuffix ""} | sed "s;fc\\([0-9]\\)*;\\0.portable%{1}.sources;g" | sed "s;openjdkportable;el;g" | sed "s;.%{_arch};.noarch;g") -%define staticlibsportablenameimpl() %(echo %{uniquesuffix ""} | sed "s;fc\\([0-9]\\)*;\\0.portable%{1}.static-libs;g" | sed "s;openjdkportable;el;g") +%define jreportablenameimpl() %(echo %{uniquesuffix ""} | sed "s;el\\([0-9]\\)*;\\0.portable%{1}.jre;g" | sed "s;openjdkportable;el;g") +%define jdkportablenameimpl() %(echo %{uniquesuffix ""} | sed "s;el\\([0-9]\\)*;\\0.portable%{1}.jdk;g" | sed "s;openjdkportable;el;g") +%define jdkportablesourcesnameimpl() %(echo %{uniquesuffix ""} | sed "s;el\\([0-9]\\)*;\\0.portable%{1}.sources;g" | sed "s;openjdkportable;el;g" | sed "s;.%{_arch};.noarch;g") +%define staticlibsportablenameimpl() %(echo %{uniquesuffix ""} | sed "s;el\\([0-9]\\)*;\\0.portable%{1}.static-libs;g" | sed "s;openjdkportable;el;g") %endif %define jreportablearchive() %{expand:%{jreportablenameimpl -- %%{1}}.tar.xz} %define jdkportablearchive() %{expand:%{jdkportablenameimpl -- %%{1}}.tar.xz} @@ -1626,6 +1626,10 @@ done %license %{unpacked_licenses}/%{jdkportablesourcesarchive -- %%{nil}} %changelog +* Thu May 18 2023 Petra Alice Mikova - 1:20.0.1.0.9-4.rolling +- fix jdkportablename, jreportablename macro to apply also to epel +- lower buildversion of jdk to 19 + * Mon May 15 2023 Jiri Vanek - 1:20.0.1.0.9-3.rolling - no longer using system cacerts during build - they are already mv-ed as .upstream in rpms From 13e6aabfbd8341abcb7a335c79b3c5570f73d83c Mon Sep 17 00:00:00 2001 From: Jiri Date: Wed, 14 Jun 2023 21:59:48 +0200 Subject: [PATCH 2/8] Redeclared ForFiles release sections as %%nil no longer works with %%1 RPM 4.19 no longer accept our double percentaged %%{nil} passed to %%{1} so we have to pass in "" but evaluate it, otherwise files record will include it --- java-latest-openjdk-portable.spec | 51 +++++++++++++++++++------------ 1 file changed, 32 insertions(+), 19 deletions(-) diff --git a/java-latest-openjdk-portable.spec b/java-latest-openjdk-portable.spec index 998e3b8..211ec00 100644 --- a/java-latest-openjdk-portable.spec +++ b/java-latest-openjdk-portable.spec @@ -338,7 +338,7 @@ # buildjdkver is usually same as %%{featurever}, # but in time of bootstrap of next jdk, it is featurever-1, # and this it is better to change it here, on single place -%global buildjdkver 19 +%global buildjdkver 20 # We don't add any LTS designator for STS packages (Fedora and EPEL). # We need to explicitly exclude EPEL as it would have the %%{rhel} macro defined. %if 0%{?rhel} && !0%{?epel} @@ -472,6 +472,14 @@ # top of the JDK archive %define staticlibsportablename() %{expand:%{jdkportablenameimpl -- %%{1}}} +# RPM 4.19 no longer accept our double percentaged %%{nil} passed to %%{1} +# so we have to pass in "" but evaluate it, otherwise files record will include it +%define jreportablearchiveForFiles() %(echo %{jreportablearchive -- ""}) +%define jdkportablearchiveForFiles() %(echo %{jdkportablearchive -- ""}) +%define jdkportablesourcesarchiveForFiles() %(echo %{jdkportablesourcesarchive -- ""}) +%define staticlibsportablearchiveForFiles() %(echo %{staticlibsportablearchive -- ""}) +%define jdkportablesourcesnameForFiles() %(echo %{jdkportablesourcesname -- ""}) + ################################################################# # fix for https://bugzilla.redhat.com/show_bug.cgi?id=1111349 # https://bugzilla.redhat.com/show_bug.cgi?id=1590796#c14 @@ -1556,9 +1564,9 @@ done %if %{include_normal_build} %files # main package builds always -%{_jvmdir}/%{jreportablearchive -- %%{nil}} -%{_jvmdir}/%{jreportablearchive -- %%{nil}}.sha256sum -%license %{unpacked_licenses}/%{jdkportablesourcesarchive -- %%{nil}} +%{_jvmdir}/%{jreportablearchiveForFiles} +%{_jvmdir}/%{jreportablearchiveForFiles}.sha256sum +%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles} %else %files # placeholder @@ -1566,19 +1574,19 @@ done %if %{include_normal_build} %files devel -%{_jvmdir}/%{jdkportablearchive -- %%{nil}} +%{_jvmdir}/%{jdkportablearchiveForFiles} #%{_jvmdir}/%{jdkportablearchive -- .debuginfo} -%{_jvmdir}/%{jdkportablearchive -- %%{nil}}.sha256sum +%{_jvmdir}/%{jdkportablearchiveForFiles}.sha256sum #%{_jvmdir}/%{jdkportablearchive -- .debuginfo}.sha256sum -%license %{unpacked_licenses}/%{jdkportablesourcesarchive -- %%{nil}} +%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles} %endif %if %{include_normal_build} %if %{include_staticlibs} %files static-libs -%{_jvmdir}/%{staticlibsportablearchive -- %%{nil}} -%{_jvmdir}/%{staticlibsportablearchive -- %%{nil}}.sha256sum -%license %{unpacked_licenses}/%{jdkportablesourcesarchive -- %%{nil}} +%{_jvmdir}/%{staticlibsportablearchiveForFiles} +%{_jvmdir}/%{staticlibsportablearchiveForFiles}.sha256sum +%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles} %endif %endif @@ -1586,18 +1594,18 @@ done %files slowdebug %{_jvmdir}/%{jreportablearchive -- .slowdebug} %{_jvmdir}/%{jreportablearchive -- .slowdebug}.sha256sum -%license %{unpacked_licenses}/%{jdkportablesourcesarchive -- %%{nil}} +%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles} %files devel-slowdebug %{_jvmdir}/%{jdkportablearchive -- .slowdebug} %{_jvmdir}/%{jdkportablearchive -- .slowdebug}.sha256sum -%license %{unpacked_licenses}/%{jdkportablesourcesarchive -- %%{nil}} +%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles} %if %{include_staticlibs} %files static-libs-slowdebug %{_jvmdir}/%{staticlibsportablearchive -- .slowdebug} %{_jvmdir}/%{staticlibsportablearchive -- .slowdebug}.sha256sum -%license %{unpacked_licenses}/%{jdkportablesourcesarchive -- %%{nil}} +%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles} %endif %endif @@ -1605,27 +1613,32 @@ done %files fastdebug %{_jvmdir}/%{jreportablearchive -- .fastdebug} %{_jvmdir}/%{jreportablearchive -- .fastdebug}.sha256sum -%license %{unpacked_licenses}/%{jdkportablesourcesarchive -- %%{nil}} +%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles} %files devel-fastdebug %{_jvmdir}/%{jdkportablearchive -- .fastdebug} %{_jvmdir}/%{jdkportablearchive -- .fastdebug}.sha256sum -%license %{unpacked_licenses}/%{jdkportablesourcesarchive -- %%{nil}} +%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles} %if %{include_staticlibs} %files static-libs-fastdebug %{_jvmdir}/%{staticlibsportablearchive -- .fastdebug} %{_jvmdir}/%{staticlibsportablearchive -- .fastdebug}.sha256sum -%license %{unpacked_licenses}/%{jdkportablesourcesarchive -- %%{nil}} +%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles} %endif %endif %files sources -%{_jvmdir}/%{jdkportablesourcesarchive -- %%{nil}} -%{_jvmdir}/%{jdkportablesourcesarchive -- %%{nil}}.sha256sum -%license %{unpacked_licenses}/%{jdkportablesourcesarchive -- %%{nil}} +%{_jvmdir}/%{jdkportablesourcesarchiveForFiles} +%{_jvmdir}/%{jdkportablesourcesarchiveForFiles}.sha256sum +%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles} %changelog +* Fri Jun 16 2023 Jiri Vanek - 1:20.0.1.0.9-4.rolling +- Redeclared ForFiles release sections as %%nil no longer works with %%1 +- RPM 4.19 no longer accept our double percentaged %%{nil} passed to %%{1} +- so we have to pass in "" but evaluate it, otherwise files record will include it + * Thu May 18 2023 Petra Alice Mikova - 1:20.0.1.0.9-4.rolling - fix jdkportablename, jreportablename macro to apply also to epel - lower buildversion of jdk to 19 From 963d225681251e41c29565d9b88adafe173a8f1b Mon Sep 17 00:00:00 2001 From: Petra Mikova Date: Tue, 20 Jun 2023 10:37:29 +0200 Subject: [PATCH 3/8] Bump rpmrelease --- java-latest-openjdk-portable.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/java-latest-openjdk-portable.spec b/java-latest-openjdk-portable.spec index 211ec00..ad83ae0 100644 --- a/java-latest-openjdk-portable.spec +++ b/java-latest-openjdk-portable.spec @@ -391,7 +391,7 @@ %global top_level_dir_name %{origin} %global top_level_dir_name_backup %{top_level_dir_name}-backup %global buildver 9 -%global rpmrelease 4 +%global rpmrelease 5 # 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 # Using 10 digits may overflow the int used for priority, so we combine the patch and build versions @@ -1634,7 +1634,7 @@ done %license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles} %changelog -* Fri Jun 16 2023 Jiri Vanek - 1:20.0.1.0.9-4.rolling +* Fri Jun 16 2023 Jiri Vanek - 1:20.0.1.0.9-5.rolling - Redeclared ForFiles release sections as %%nil no longer works with %%1 - RPM 4.19 no longer accept our double percentaged %%{nil} passed to %%{1} - so we have to pass in "" but evaluate it, otherwise files record will include it From b6d5401e2bbba91931414ade98c5c4bba98969d2 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 27 Jun 2023 11:30:56 +0000 Subject: [PATCH 4/8] Simplify portable archive name macros Avoid using fragile regex and instead match on "%{version}-%{release}" to do the substitutions. This should make it both simpler (avoiding separate rhel7 conditional) and more robust in case the build system sets a different dist tag than what the regex expected. --- java-latest-openjdk-portable.spec | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/java-latest-openjdk-portable.spec b/java-latest-openjdk-portable.spec index ad83ae0..7dae404 100644 --- a/java-latest-openjdk-portable.spec +++ b/java-latest-openjdk-portable.spec @@ -338,7 +338,7 @@ # buildjdkver is usually same as %%{featurever}, # but in time of bootstrap of next jdk, it is featurever-1, # and this it is better to change it here, on single place -%global buildjdkver 20 +%global buildjdkver %{featurever} # We don't add any LTS designator for STS packages (Fedora and EPEL). # We need to explicitly exclude EPEL as it would have the %%{rhel} macro defined. %if 0%{?rhel} && !0%{?epel} @@ -391,7 +391,7 @@ %global top_level_dir_name %{origin} %global top_level_dir_name_backup %{top_level_dir_name}-backup %global buildver 9 -%global rpmrelease 5 +%global rpmrelease 6 # 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 # Using 10 digits may overflow the int used for priority, so we combine the patch and build versions @@ -450,17 +450,10 @@ %define uniquesuffix() %{expand:%{fullversion}.%{_arch}%{?1}} # portable only declarations %global jreimage jre -%if (0%{?rhel} > 0 && 0%{?rhel} < 8) -%define jreportablenameimpl() %(echo %{uniquesuffix ""} | sed "s;el7\\(_[0-9]\\)*;portable%{1}.jre.;g" | sed "s;openjdkportable;el;g") -%define jdkportablenameimpl() %(echo %{uniquesuffix ""} | sed "s;el7\\(_[0-9]\\)*;portable%{1}.jdk.;g" | sed "s;openjdkportable;el;g") -%define jdkportablesourcesnameimpl() %(echo %{uniquesuffix ""} | sed "s;el7\\(_[0-9]\\)*;portable%{1}.sources.;g" | sed "s;openjdkportable;el;g" | sed "s;.%{_arch};.noarch;g") -%define staticlibsportablenameimpl() %(echo %{uniquesuffix ""} | sed "s;el7\\(_[0-9]\\)*;portable%{1}.static-libs.;g" | sed "s;openjdkportable;el;g") -%else -%define jreportablenameimpl() %(echo %{uniquesuffix ""} | sed "s;el\\([0-9]\\)*;\\0.portable%{1}.jre;g" | sed "s;openjdkportable;el;g") -%define jdkportablenameimpl() %(echo %{uniquesuffix ""} | sed "s;el\\([0-9]\\)*;\\0.portable%{1}.jdk;g" | sed "s;openjdkportable;el;g") -%define jdkportablesourcesnameimpl() %(echo %{uniquesuffix ""} | sed "s;el\\([0-9]\\)*;\\0.portable%{1}.sources;g" | sed "s;openjdkportable;el;g" | sed "s;.%{_arch};.noarch;g") -%define staticlibsportablenameimpl() %(echo %{uniquesuffix ""} | sed "s;el\\([0-9]\\)*;\\0.portable%{1}.static-libs;g" | sed "s;openjdkportable;el;g") -%endif +%define jreportablenameimpl() %(echo %{uniquesuffix ""} | sed "s;%{version}-%{release};\\0.portable%{1}.jre;g" | sed "s;openjdkportable;el;g") +%define jdkportablenameimpl() %(echo %{uniquesuffix ""} | sed "s;%{version}-%{release};\\0.portable%{1}.jdk;g" | sed "s;openjdkportable;el;g") +%define jdkportablesourcesnameimpl() %(echo %{uniquesuffix ""} | sed "s;%{version}-%{release};\\0.portable%{1}.sources;g" | sed "s;openjdkportable;el;g" | sed "s;.%{_arch};.noarch;g") +%define staticlibsportablenameimpl() %(echo %{uniquesuffix ""} | sed "s;%{version}-%{release};\\0.portable%{1}.static-libs;g" | sed "s;openjdkportable;el;g") %define jreportablearchive() %{expand:%{jreportablenameimpl -- %%{1}}.tar.xz} %define jdkportablearchive() %{expand:%{jdkportablenameimpl -- %%{1}}.tar.xz} %define jdkportablesourcesarchive() %{expand:%{jdkportablesourcesnameimpl -- %%{1}}.tar.xz} @@ -1634,7 +1627,10 @@ done %license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles} %changelog -* Fri Jun 16 2023 Jiri Vanek - 1:20.0.1.0.9-5.rolling +* Tue Jun 27 2023 Kalev Lember - 1:20.0.1.0.9-6.rolling +- Simplify portable archive name macros + +* Mon May 15 2023 Jiri Vanek - 1:20.0.1.0.9-4.rolling - Redeclared ForFiles release sections as %%nil no longer works with %%1 - RPM 4.19 no longer accept our double percentaged %%{nil} passed to %%{1} - so we have to pass in "" but evaluate it, otherwise files record will include it From bcfcadb4971a0bd31e304f5d44bf04b6850f009e Mon Sep 17 00:00:00 2001 From: Jiri Date: Fri, 30 Jun 2023 10:28:09 +0200 Subject: [PATCH 5/8] Bad changelog --- java-latest-openjdk-portable.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/java-latest-openjdk-portable.spec b/java-latest-openjdk-portable.spec index 7dae404..017bd0e 100644 --- a/java-latest-openjdk-portable.spec +++ b/java-latest-openjdk-portable.spec @@ -1630,12 +1630,12 @@ done * Tue Jun 27 2023 Kalev Lember - 1:20.0.1.0.9-6.rolling - Simplify portable archive name macros -* Mon May 15 2023 Jiri Vanek - 1:20.0.1.0.9-4.rolling +* Mon May 18 2023 Jiri Vanek - 1:20.0.1.0.9-4.rolling - Redeclared ForFiles release sections as %%nil no longer works with %%1 - RPM 4.19 no longer accept our double percentaged %%{nil} passed to %%{1} - so we have to pass in "" but evaluate it, otherwise files record will include it -* Thu May 18 2023 Petra Alice Mikova - 1:20.0.1.0.9-4.rolling +* Thu May 15 2023 Petra Alice Mikova - 1:20.0.1.0.9-4.rolling - fix jdkportablename, jreportablename macro to apply also to epel - lower buildversion of jdk to 19 From e4c558138fe1688c6de1c4185f76cf381d280f5f Mon Sep 17 00:00:00 2001 From: Jiri Date: Fri, 30 Jun 2023 15:30:20 +0200 Subject: [PATCH 6/8] Fixing date in changelog --- java-latest-openjdk-portable.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/java-latest-openjdk-portable.spec b/java-latest-openjdk-portable.spec index 017bd0e..1d89496 100644 --- a/java-latest-openjdk-portable.spec +++ b/java-latest-openjdk-portable.spec @@ -1630,12 +1630,12 @@ done * Tue Jun 27 2023 Kalev Lember - 1:20.0.1.0.9-6.rolling - Simplify portable archive name macros -* Mon May 18 2023 Jiri Vanek - 1:20.0.1.0.9-4.rolling +* Thu May 18 2023 Jiri Vanek - 1:20.0.1.0.9-4.rolling - Redeclared ForFiles release sections as %%nil no longer works with %%1 - RPM 4.19 no longer accept our double percentaged %%{nil} passed to %%{1} - so we have to pass in "" but evaluate it, otherwise files record will include it -* Thu May 15 2023 Petra Alice Mikova - 1:20.0.1.0.9-4.rolling +* Mon May 15 2023 Petra Alice Mikova - 1:20.0.1.0.9-4.rolling - fix jdkportablename, jreportablename macro to apply also to epel - lower buildversion of jdk to 19 From 279b16ab6c2873dec4cb30def49817c012a77f30 Mon Sep 17 00:00:00 2001 From: Jiri Date: Thu, 10 Apr 2025 20:37:13 +0200 Subject: [PATCH 7/8] Disabled pandoc requirement for build --- java-latest-openjdk-portable.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/java-latest-openjdk-portable.spec b/java-latest-openjdk-portable.spec index c3ae220..6052025 100644 --- a/java-latest-openjdk-portable.spec +++ b/java-latest-openjdk-portable.spec @@ -769,7 +769,8 @@ BuildRequires: libffi-devel %endif # Full documentation build requirements BuildRequires: graphviz -BuildRequires: pandoc +# pandoc missing in epel10 temporary? +# BuildRequires: pandoc # 2023c required as of JDK-8305113 BuildRequires: tzdata-java >= 2023c # cacerts build requirement in portable mode From 30ed4003e254f3d6aba232958547c1f9a0a2031e Mon Sep 17 00:00:00 2001 From: Jiri Date: Fri, 11 Apr 2025 10:12:55 +0200 Subject: [PATCH 8/8] Revert "Disabled pandoc requirement for build" This reverts commit 279b16ab6c2873dec4cb30def49817c012a77f30. Without pandoc, there are no man pages --- java-latest-openjdk-portable.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/java-latest-openjdk-portable.spec b/java-latest-openjdk-portable.spec index 6052025..c3ae220 100644 --- a/java-latest-openjdk-portable.spec +++ b/java-latest-openjdk-portable.spec @@ -769,8 +769,7 @@ BuildRequires: libffi-devel %endif # Full documentation build requirements BuildRequires: graphviz -# pandoc missing in epel10 temporary? -# BuildRequires: pandoc +BuildRequires: pandoc # 2023c required as of JDK-8305113 BuildRequires: tzdata-java >= 2023c # cacerts build requirement in portable mode