From 9aa3e1f2e606c52368ca62340f26a99a2df83ddb Mon Sep 17 00:00:00 2001 From: Adam Samalik Date: Mon, 10 Jul 2023 12:58:55 +0200 Subject: [PATCH] re-import sources as agreed with the maintainer --- .gitignore | 4 ++++ libopenraw.spec | 16 +++++++++++++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index c2d3f41..15a37b6 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,5 @@ +libopenraw-0.0.8.tar.gz +/libopenraw-0.0.9.tar.bz2 +/libopenraw-0.1.0.tar.bz2 +/libopenraw-0.1.1.tar.bz2 /libopenraw-0.1.2.tar.bz2 diff --git a/libopenraw.spec b/libopenraw.spec index 58edecc..7e2d333 100644 --- a/libopenraw.spec +++ b/libopenraw.spec @@ -1,7 +1,7 @@ Summary: Decode camera RAW files Name: libopenraw Version: 0.1.2 -Release: 4%{?dist} +Release: 5%{?dist} License: LGPLv3+ URL: http://libopenraw.freedesktop.org/wiki Source0: http://libopenraw.freedesktop.org/download/%{name}-%{version}.tar.bz2 @@ -57,19 +57,25 @@ digital cameras, in GTK+ applications. %prep %autosetup +# We don't want to install pixbuf loaders outside the prefix +%define loadersdir $( \ + pkg-config --variable=gdk_pixbuf_moduledir gdk-pixbuf-2.0 | \ + sed 's,/usr/%{_lib},%{_libdir},' \ +) + %build %configure --disable-static --enable-gnome --disable-silent-rules # Omit unused direct shared library dependencies. sed --in-place --expression 's! -shared ! -Wl,--as-needed\0!g' libtool -%{make_build} +%{make_build} GDK_PIXBUF_DIR=%loadersdir %check make check %install -%make_install +%make_install GDK_PIXBUF_DIR=%loadersdir find $RPM_BUILD_ROOT -type f -name "*.la" -delete %post -p /sbin/ldconfig @@ -111,6 +117,10 @@ find $RPM_BUILD_ROOT -type f -name "*.la" -delete %{_libdir}/gdk-pixbuf-2.0/*/loaders/*.so %changelog +* Tue Dec 15 2020 Wim Taymans - 0.1.2-5 +- Don't install gdk-pixbuf loaders out of prefix +- Resolves: rhbz#1907511 + * Wed Feb 07 2018 Fedora Release Engineering - 0.1.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild