From 332814297f03672f415b981fe777ea023c9fbe53 Mon Sep 17 00:00:00 2001 From: Severin Gehwolf Date: Wed, 24 Apr 2019 11:33:28 +0200 Subject: [PATCH] Don't generate lib-style requires for -slowdebug subpackages. In the is_system_jdk == 1 case, slowdebug subpackages would have requirements autogenerated, leading to product builds being dragged in so as to satisfy RPM dependencies. Resolves: RHBZ#1702379 --- java-11-openjdk.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/java-11-openjdk.spec b/java-11-openjdk.spec index b05c959..f0f90b0 100644 --- a/java-11-openjdk.spec +++ b/java-11-openjdk.spec @@ -262,7 +262,9 @@ %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}}/.*$ %else # Don't generate provides/requires for JDK provided shared libraries at all. %global __provides_exclude ^(%{_privatelibs}|%{_publiclibs})$ @@ -949,7 +951,7 @@ Provides: java-src%{?1} = %{epoch}:%{version}-%{release} Name: java-%{javaver}-%{origin} Version: %{newjavaver}.%{buildver} -Release: 1%{?dist} +Release: 2%{?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 @@ -1859,6 +1861,10 @@ require "copy_jdk_configs.lua" %changelog +* Wed Apr 24 2019 Severin Gehwolf - 1:11.0.3.7-2 +- Don't generate lib-style requires for -slowdebug subpackages. +- Resolves: RHBZ#1702379 + * Tue Apr 23 2019 Severin Gehwolf - 1:11.0.3.7-1 - Fix requires/provides for the non-system JDK case. JDK 11 isn't a system JDK at this point.