diff --git a/SDL2.spec b/SDL2.spec index 28784db..171c888 100644 --- a/SDL2.spec +++ b/SDL2.spec @@ -1,6 +1,16 @@ +# For the generated library symbol suffix +%if 0%{?__isa_bits} == 32 +%global libsymbolsuffix %{nil} +%else +%global libsymbolsuffix ()(%{__isa_bits}bit) +%endif + +# For declaring rich dependency on libdecor +%global libdecor_majver 0 + Name: SDL2 Version: 2.0.16 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Cross-platform multimedia library License: zlib and MIT URL: http://www.libsdl.org/ @@ -45,7 +55,7 @@ BuildRequires: pkgconfig(dbus-1) # IBus BuildRequires: pkgconfig(ibus-1.0) # Wayland -#BuildRequires: pkgconfig(libdecor-0) +BuildRequires: pkgconfig(libdecor-%{libdecor_majver}) BuildRequires: pkgconfig(wayland-client) BuildRequires: pkgconfig(wayland-egl) BuildRequires: pkgconfig(wayland-cursor) @@ -58,6 +68,9 @@ BuildRequires: vulkan-devel BuildRequires: mesa-libgbm-devel BuildRequires: libdrm-devel +# Ensure libdecor is pulled in when libwayland-client is (rhbz#1992804) +Requires: (libdecor-%{libdecor_majver}.so.%{libdecor_majver}%{libsymbolsuffix} if libwayland-client) + %description Simple DirectMedia Layer (SDL) is a cross-platform multimedia library designed to provide fast access to the graphics frame buffer and audio device. @@ -142,6 +155,10 @@ install -p -m 644 %{SOURCE1} %{buildroot}%{_includedir}/SDL2/SDL_config.h %{_libdir}/lib*.a %changelog +* Wed Dec 01 2021 Neal Gompa - 2.0.16-5 +- Re-enable libdecor support now that it's available in RHEL 9 + Resolves: rhbz#2003471 + * Thu Aug 26 2021 Wim Taymans - 2.0.16-4 - Build with SDL_STATIC_PIC and SDL_STATIC to actually make the static version of SDL2