From c65b1c5b70557a243ff3ef9580d52c638eb867ae Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Jul 29 2021 19:12:24 +0000 Subject: Fix FTBFS (disable rpath harder) (rhbz#1987360) --- diff --git a/SDL_image.spec b/SDL_image.spec index d7014d0..b8f657c 100644 --- a/SDL_image.spec +++ b/SDL_image.spec @@ -3,7 +3,7 @@ Name: SDL_image Version: 1.2.12 -Release: 28%{?dist} +Release: 29%{?dist} Summary: Image loading library for SDL License: LGPLv2+ @@ -11,8 +11,7 @@ URL: http://www.libsdl.org/projects/SDL_image/ Source0: http://www.libsdl.org/projects/%{name}/release/%{name}-%{version}.tar.gz Patch0: SDL_image-1.2.12-interlaced-png-warning-fix.patch -BuildRequires: make -BuildRequires: gcc +BuildRequires: gcc make BuildRequires: SDL-devel >= 1.2.10 BuildRequires: libjpeg-devel BuildRequires: libpng-devel @@ -51,6 +50,9 @@ developing applications that use %{name}. --disable-tif-shared \ --disable-static \ --disable-rpath +# Remove useless /usr/lib64 rpath on 64bit archs +sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool +sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool make %{?_smp_mflags} @@ -66,7 +68,8 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %files -%doc README CHANGES COPYING +%doc README CHANGES +%license COPYING %{_bindir}/showimage %{_libdir}/lib*.so.* @@ -78,6 +81,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %changelog +* Thu Jul 29 2021 Hans de Goede - 1.2.12-29 +- Fix FTBFS (disable rpath harder) (rhbz#1987360) + * Wed Jul 21 2021 Fedora Release Engineering - 1.2.12-28 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild