From e70051f69c673826c1545a15ab15f30fa7c4b493 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Fri, 7 Jan 2022 13:37:36 -0500 Subject: [PATCH] Move libSDLmain from -static to -devel --- SDL2.spec | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/SDL2.spec b/SDL2.spec index 2dc3192..6b67614 100644 --- a/SDL2.spec +++ b/SDL2.spec @@ -10,7 +10,7 @@ Name: SDL2 Version: 2.0.18 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Cross-platform multimedia library License: zlib and MIT URL: http://www.libsdl.org/ @@ -87,6 +87,8 @@ Requires: %{name}%{?_isa} = %{version}-%{release} Requires: mesa-libEGL-devel%{?_isa} Requires: mesa-libGLES-devel%{?_isa} Requires: libX11-devel%{?_isa} +# Conflict with versions before libSDLmain moved here +Conflicts: %{name}-static < 2.0.18-4 %description devel Simple DirectMedia Layer (SDL) is a cross-platform multimedia library designed @@ -98,6 +100,8 @@ developing SDL applications. Summary: Static libraries for SDL2 # Needed to keep CMake happy Requires: %{name}-devel%{?_isa} = %{version}-%{release} +# Conflict with versions before libSDLmain moved to -devel +Conflicts: %{name}-devel < 2.0.18-4 %description static Static libraries for SDL2. @@ -156,20 +160,24 @@ install -p -m 644 %{SOURCE2} %{buildroot}%{_includedir}/SDL2/SDL_revision.h %doc README.md TODO.txt WhatsNew.txt %{_bindir}/*-config %{_libdir}/lib*.so +%{_libdir}/libSDL2main.a %{_libdir}/pkgconfig/sdl2.pc %dir %{_libdir}/cmake/SDL2 %{_libdir}/cmake/SDL2/SDL2Config*.cmake %{_libdir}/cmake/SDL2/SDL2Targets*.cmake +%{_libdir}/cmake/SDL2/SDL2mainTargets*.cmake %{_includedir}/SDL2 %{_datadir}/aclocal/* %files static %license LICENSE.txt -%{_libdir}/lib*.a -%{_libdir}/cmake/SDL2/SDL2mainTargets*.cmake +%{_libdir}/libSDL2.a %{_libdir}/cmake/SDL2/SDL2staticTargets*.cmake %changelog +* Fri Jan 07 2022 Neal Gompa - 2.0.18-4 +- Move libSDLmain from -static to -devel + * Tue Jan 04 2022 Neal Gompa - 2.0.18-3 - Backport fix for building against wayland-1.20+ - Add patch to split SDL2 CMake targets for static libraries