From 5b643ea94cf061aa3985b767f19df4128298c33e Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Wed, 1 Dec 2021 09:32:01 -0500 Subject: [PATCH] Obsolete the SDL package properly RHEL had one mass rebuild after branching from Fedora Linux 34, so the EVRs for obsoleting SDL need to be updated. Additionally, obsolete the SDL-static package even when we do not provide static libraries. Resolves: rhbz#1970507 Signed-off-by: Neal Gompa --- sdl12-compat.spec | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/sdl12-compat.spec b/sdl12-compat.spec index 282c961..d7f534a 100644 --- a/sdl12-compat.spec +++ b/sdl12-compat.spec @@ -11,7 +11,7 @@ Name: sdl12-compat Version: 0.0.1~git.%{commitdate}.%{shortcommit} -Release: 1%{?dist} +Release: 2%{?dist} Summary: SDL 1.2 runtime compatibility library using SDL 2.0 # mp3 decoder code is MIT-0/PD # SDL_opengl.h is zlib and MIT @@ -36,7 +36,7 @@ BuildRequires: SDL2-devel BuildRequires: mesa-libGL-devel BuildRequires: mesa-libGLU-devel # This replaces SDL -Obsoletes: SDL < 1.2.15-47 +Obsoletes: SDL < 1.2.15-49 Conflicts: SDL < 1.2.50 Provides: SDL = 1.2.50 Provides: SDL%{?_isa} = 1.2.50 @@ -57,7 +57,11 @@ this layer. Summary: Files to develop SDL 1.2 applications using SDL 2.0 Requires: %{name}%{?_isa} = %{version}-%{release} # This replaces SDL-devel -Obsoletes: SDL-devel < 1.2.15-47 +Obsoletes: SDL-devel < 1.2.15-49 +%if ! %{with static} +# We don't provide the static library, but we want to replace SDL-static anyway +Obsoletes: SDL-static < 1.2.15-49 +%endif Conflicts: SDL-devel < 1.2.50 Provides: SDL-devel = 1.2.50 Provides: SDL-devel%{?_isa} = 1.2.50 @@ -85,7 +89,7 @@ this layer. Summary: Static library to develop SDL 1.2 applications using SDL 2.0 Requires: %{name}-devel%{?_isa} = %{version}-%{release} # This replaces SDL-static -Obsoletes: SDL-static < 1.2.15-47 +Obsoletes: SDL-static < 1.2.15-49 Conflicts: SDL-static < 1.2.50 Provides: SDL-static = 1.2.50 Provides: SDL-static%{?_isa} = 1.2.50 @@ -149,6 +153,9 @@ rm -rf %{buildroot}%{_libdir}/*.a %changelog +* Wed Dec 01 2021 Neal Gompa - 0.0.1~git.20211125.4e4527a-2 +- Obsolete the SDL package properly + * Sat Nov 27 2021 Neal Gompa - 0.0.1~git.20211125.4e4527a-1 - Update to new snapshot release