From a989b20da6d4dd386ed5e2231e30af5cfbc882a4 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 - Do not overwrite slowdebug __provides_exclude_from and __requires_exclude_from regexps - Resolves: RHEL-69995 --- java-21-openjdk.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/java-21-openjdk.spec b/java-21-openjdk.spec index aedec12..8279933 100644 --- a/java-21-openjdk.spec +++ b/java-21-openjdk.spec @@ -432,10 +432,9 @@ %global __provides_exclude ^(%{_privatelibs})$ %global __requires_exclude ^(%{_privatelibs})$ # Never generate lib-style provides/requires for any debug 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}}/.*$ +%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})$ @@ -2409,9 +2408,11 @@ end - Make javadoc-zip own /usr/share/javadoc/java-21-openjdk - Delete old conflicting links in pretrans for headless, javadoc and javadoc-zip - Use compatiblename not name in uniquejavadocdir and uniquesuffix +- Do not overwrite slowdebug __provides_exclude_from and __requires_exclude_from regexps - Resolves: RHEL-71920 - Resolves: RHEL-71954 - Resolves: RHEL-69321 +- Resolves: RHEL-69995 * Tue Oct 29 2024 Troy Dawson - 1:21.0.5.0.11-2.1 - Bump release for October 2024 mass rebuild: