Move libSDLmain from -static to -devel

This commit is contained in:
Neal Gompa 2022-01-07 13:37:36 -05:00
parent db732fcadc
commit e70051f69c

View File

@ -10,7 +10,7 @@
Name: SDL2 Name: SDL2
Version: 2.0.18 Version: 2.0.18
Release: 3%{?dist} Release: 4%{?dist}
Summary: Cross-platform multimedia library Summary: Cross-platform multimedia library
License: zlib and MIT License: zlib and MIT
URL: http://www.libsdl.org/ URL: http://www.libsdl.org/
@ -87,6 +87,8 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: mesa-libEGL-devel%{?_isa} Requires: mesa-libEGL-devel%{?_isa}
Requires: mesa-libGLES-devel%{?_isa} Requires: mesa-libGLES-devel%{?_isa}
Requires: libX11-devel%{?_isa} Requires: libX11-devel%{?_isa}
# Conflict with versions before libSDLmain moved here
Conflicts: %{name}-static < 2.0.18-4
%description devel %description devel
Simple DirectMedia Layer (SDL) is a cross-platform multimedia library designed Simple DirectMedia Layer (SDL) is a cross-platform multimedia library designed
@ -98,6 +100,8 @@ developing SDL applications.
Summary: Static libraries for SDL2 Summary: Static libraries for SDL2
# Needed to keep CMake happy # Needed to keep CMake happy
Requires: %{name}-devel%{?_isa} = %{version}-%{release} Requires: %{name}-devel%{?_isa} = %{version}-%{release}
# Conflict with versions before libSDLmain moved to -devel
Conflicts: %{name}-devel < 2.0.18-4
%description static %description static
Static libraries for SDL2. 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 %doc README.md TODO.txt WhatsNew.txt
%{_bindir}/*-config %{_bindir}/*-config
%{_libdir}/lib*.so %{_libdir}/lib*.so
%{_libdir}/libSDL2main.a
%{_libdir}/pkgconfig/sdl2.pc %{_libdir}/pkgconfig/sdl2.pc
%dir %{_libdir}/cmake/SDL2 %dir %{_libdir}/cmake/SDL2
%{_libdir}/cmake/SDL2/SDL2Config*.cmake %{_libdir}/cmake/SDL2/SDL2Config*.cmake
%{_libdir}/cmake/SDL2/SDL2Targets*.cmake %{_libdir}/cmake/SDL2/SDL2Targets*.cmake
%{_libdir}/cmake/SDL2/SDL2mainTargets*.cmake
%{_includedir}/SDL2 %{_includedir}/SDL2
%{_datadir}/aclocal/* %{_datadir}/aclocal/*
%files static %files static
%license LICENSE.txt %license LICENSE.txt
%{_libdir}/lib*.a %{_libdir}/libSDL2.a
%{_libdir}/cmake/SDL2/SDL2mainTargets*.cmake
%{_libdir}/cmake/SDL2/SDL2staticTargets*.cmake %{_libdir}/cmake/SDL2/SDL2staticTargets*.cmake
%changelog %changelog
* Fri Jan 07 2022 Neal Gompa <ngompa@fedoraproject.org> - 2.0.18-4
- Move libSDLmain from -static to -devel
* Tue Jan 04 2022 Neal Gompa <ngompa@fedoraproject.org> - 2.0.18-3 * Tue Jan 04 2022 Neal Gompa <ngompa@fedoraproject.org> - 2.0.18-3
- Backport fix for building against wayland-1.20+ - Backport fix for building against wayland-1.20+
- Add patch to split SDL2 CMake targets for static libraries - Add patch to split SDL2 CMake targets for static libraries