From 063e8010368c64611ca1a0b16fa1924c09ba672e Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sun, 14 Aug 2016 09:13:49 +0200 Subject: [PATCH] Fix whitespaces in CMake file (RHBZ #1366868) Signed-off-by: Igor Gnatenko --- SDL2.spec | 8 +++++++- bug_822210_fix_sdl2-config.cmake_whitespace.patch | 9 +++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 bug_822210_fix_sdl2-config.cmake_whitespace.patch diff --git a/SDL2.spec b/SDL2.spec index 3d871fe..87b1d51 100644 --- a/SDL2.spec +++ b/SDL2.spec @@ -1,6 +1,6 @@ Name: SDL2 Version: 2.0.4 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A cross-platform multimedia library License: zlib and MIT @@ -11,6 +11,9 @@ Source1: SDL_config.h Patch0: multilib.patch # https://bugzilla.libsdl.org/show_bug.cgi?id=3255 Patch1: SDL2-wayland-dyn-wl_proxy_marshal_constructor_versioned.patch +# https://bugzilla.libsdl.org/show_bug.cgi?id=3295 +# https://bugzilla.redhat.com/show_bug.cgi?id=1366868 +Patch2: bug_822210_fix_sdl2-config.cmake_whitespace.patch BuildRequires: alsa-lib-devel BuildRequires: audiofile-devel @@ -119,6 +122,9 @@ rm -f %{buildroot}%{_libdir}/*.la %{_libdir}/lib*.a %changelog +* Sun Aug 14 2016 Igor Gnatenko - 2.0.4-8 +- Fix whitespaces in CMake file (RHBZ #1366868) + * Sun Jul 10 2016 Igor Gnatenko - 2.0.4-7 - Remove useless Requirements from -devel subpkg diff --git a/bug_822210_fix_sdl2-config.cmake_whitespace.patch b/bug_822210_fix_sdl2-config.cmake_whitespace.patch new file mode 100644 index 0000000..9fcd60d --- /dev/null +++ b/bug_822210_fix_sdl2-config.cmake_whitespace.patch @@ -0,0 +1,9 @@ +diff --git a/sdl2-config.cmake.in b/sdl2-config.cmake.in +index e5a036a..03efbe1 100644 +--- a/sdl2-config.cmake.in ++++ b/sdl2-config.cmake.in +@@ -8,3 +8,4 @@ set(SDL2_EXEC_PREFIX "@prefix@") + set(SDL2_LIBDIR "@libdir@") + set(SDL2_INCLUDE_DIRS "@includedir@/SDL2") + set(SDL2_LIBRARIES "-L${SDL2_LIBDIR} @SDL_RLD_FLAGS@ @SDL_LIBS@") ++string(STRIP "${SDL2_LIBRARIES}" SDL2_LIBRARIES)