From 1fc6fe351cd82bf4907fa7b2824ed0c507c37aea Mon Sep 17 00:00:00 2001 From: Thomas Fitzsimmons Date: Wed, 4 Dec 2024 12:18:19 -0500 Subject: [PATCH] Do not overwrite slowdebug __provides_exclude_from and __requires_exclude_from regexps Resolves: RHEL-212328 --- java-1.8.0-openjdk.spec | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index 95d8275..872bd3a 100644 --- a/java-1.8.0-openjdk.spec +++ b/java-1.8.0-openjdk.spec @@ -456,11 +456,10 @@ ExclusiveArch: %{aarch64} %{ix86} %{ppc64le} s390x x86_64 %if %is_system_jdk %global __provides_exclude ^(%{_privatelibs})$ %global __requires_exclude ^(%{_privatelibs})$ -# Never generate lib-style provides/requires for slowdebug packages -%global __provides_exclude_from ^.*/%{uniquesuffix -- %{debug_suffix_unquoted}}/.*$ -%global __requires_exclude_from ^.*/%{uniquesuffix -- %{debug_suffix_unquoted}}/.*$ -%global __provides_exclude_from ^.*/%{uniquesuffix -- %{fastdebug_suffix_unquoted}}/.*$ -%global __requires_exclude_from ^.*/%{uniquesuffix -- %{fastdebug_suffix_unquoted}}/.*$ +# Never generate lib-style provides/requires for any debug packages +%global exclude_from_regexp ^.*/%{uniquesuffix -- %{debug_suffix_unquoted}}/.*$|^.*/%{uniquesuffix -- %{fastdebug_suffix_unquoted}}/.*$ +%global __provides_exclude_from %{exclude_from_regexp} +%global __requires_exclude_from %{exclude_from_regexp} %else # Don't generate provides/requires for JDK provided shared libraries at all. %global __provides_exclude ^(%{_privatelibs}|%{_publiclibs})$ @@ -2987,7 +2986,9 @@ cjc.mainProgram(args) * Fri Jul 17 2026 Thomas Fitzsimmons - 1:1.8.0.502.b07-1.1 - Make headless own /usr/share/doc/java-1.8.0-openjdk - Make javadoc-zip own /usr/share/javadoc/java-1.8.0-openjdk +- Do not overwrite slowdebug __provides_exclude_from and __requires_exclude_from regexps - Resolves: RHEL-212327 +- Resolves: RHEL-212328 * Mon Apr 20 2026 Andrew Hughes - 1:1.8.0.492.b09-2 - Bump release for PQC build