From 339db457737b46a8d160b6c05f8a5fa9e4ca5ef5169fb5cd02d6663cbafbc1a9 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 18 Apr 2024 13:58:29 +0000 Subject: [PATCH] Accepting request 1168866 from GNOME:Next - Fix path to gdk-pixbuf-query-loader in pkg-config file: we rename the loader to be multi-arch compatible and thus also need to adjust the .pc file to have build-systems find it. OBS-URL: https://build.opensuse.org/request/show/1168866 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdk-pixbuf?expand=0&rev=198 --- gdk-pixbuf.changes | 7 +++++++ gdk-pixbuf.spec | 6 ++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/gdk-pixbuf.changes b/gdk-pixbuf.changes index f2a4812..53d1044 100644 --- a/gdk-pixbuf.changes +++ b/gdk-pixbuf.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Apr 15 13:29:37 UTC 2024 - Dominique Leuenberger + +- Fix path to gdk-pixbuf-query-loader in pkg-config file: we rename + the loader to be multi-arch compatible and thus also need to + adjust the .pc file to have build-systems find it. + ------------------------------------------------------------------- Wed Oct 26 11:58:08 UTC 2022 - Bjørn Lie diff --git a/gdk-pixbuf.spec b/gdk-pixbuf.spec index 578cec4..9fc6d25 100644 --- a/gdk-pixbuf.spec +++ b/gdk-pixbuf.spec @@ -1,7 +1,7 @@ # # spec file for package gdk-pixbuf # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -27,7 +27,7 @@ License: LGPL-2.1-or-later Group: Development/Libraries/GNOME URL: https://www.gnome.org/ -# A filefrom the test suite is correctly identified by clamav to be a +# A file from the test suite is correctly identified by clamav to be a # malicious BC.Gif.Exploit.Agent-1425366.Agent. This is an intentional part of # the test suite to ensure it has no negative side effects. Change the Source0 # from tar.xz to zip to bypass clamav scanning on SLE. @@ -152,6 +152,8 @@ touch %{buildroot}%{_libdir}/gdk-pixbuf-2.0/%{gdk_pixbuf_binary_version}/loaders %if "%{_lib}" == "lib64" mv %{buildroot}%{_bindir}/gdk-pixbuf-query-loaders %{buildroot}%{_bindir}/gdk-pixbuf-query-loaders-64 mv %{buildroot}%{_mandir}/man1/gdk-pixbuf-query-loaders.1 %{buildroot}%{_mandir}/man1/gdk-pixbuf-query-loaders-64.1 + sed -i 's|gdk_pixbuf_query_loaders=${bindir}/gdk-pixbuf-query-loaders|gdk_pixbuf_query_loaders=${bindir}/gdk-pixbuf-query-loaders-64|' \ + %{buildroot}%{_libdir}/pkgconfig/gdk-pixbuf-2.0.pc %endif # Install rpm macros mkdir -p %{buildroot}%{_rpmmacrodir}