diff --git a/SPECS/sdl12-compat.spec b/SPECS/sdl12-compat.spec index 59c2545..9a80b66 100644 --- a/SPECS/sdl12-compat.spec +++ b/SPECS/sdl12-compat.spec @@ -11,7 +11,7 @@ Name: sdl12-compat Version: 0.0.1~git.%{commitdate}.%{shortcommit} -Release: 3%{?dist} +Release: 4%{?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 @@ -58,13 +58,14 @@ 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-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 +%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 +Conflicts: SDL-static < 1.2.50 +%endif # Add deps required to compile SDL apps ## For SDL_opengl.h Requires: pkgconfig(gl) @@ -153,6 +154,9 @@ rm -rf %{buildroot}%{_libdir}/*.a %changelog +* Sat Dec 11 2021 Neal Gompa - 0.0.1~git.20211125.4e4527a-4 +- Conflict with all old SDL subpackages properly + * Tue Dec 07 2021 Wim Taymans - 0.0.1~git.20211125.4e4527a-3 - Bump for rebuild after resync