From 1b3cb88b7094626b44769995907ea77aea111589 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sat, 6 Jan 2024 04:21:14 +0100 Subject: [PATCH] multiarch cohexistence of gdk-pixbuf.loaders [release 2.30.8-5mamba;Thu May 28 2015] --- libgdk-pixbuf.spec | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/libgdk-pixbuf.spec b/libgdk-pixbuf.spec index 085a58e..2885b21 100644 --- a/libgdk-pixbuf.spec +++ b/libgdk-pixbuf.spec @@ -9,7 +9,7 @@ Name: libgdk-pixbuf Epoch: 1 Version: 2.30.8 -Release: 4mamba +Release: 5mamba Summary: An image loading library Group: System/Libraries Vendor: openmamba @@ -106,6 +106,8 @@ This package contains %{name} API documentation. touch %{buildroot}%{_libdir}/gdk-pixbuf-2.0/2.10.0/loaders.cache +mkdir -p %{buildroot}%{_sysconfdir}/gtk-3.0/%{_target_platform} + %find_lang gdk-pixbuf #%ifarch x86_64 @@ -131,17 +133,6 @@ touch %{buildroot}%{_libdir}/gdk-pixbuf-2.0/2.10.0/loaders.cache %post /sbin/ldconfig -if [ $1 -ge 1 ]; then - %{_bindir}/gdk-pixbuf-query-loaders%{arch_suffix} --update-cache || : -%ifarch %{ix86} - if [ ! -e /usr/lib64/gdk-pixbuf-2.0/2.10.0/loaders.cache ]; then -%endif - [ -e %{_sysconfdir}/gtk-3.0 ] && %{_bindir}/gdk-pixbuf-query-loaders%{arch_suffix} > %{_sysconfdir}/gtk-3.0/gdk-pixbuf.loaders || : - [ -e %{_sysconfdir}/gtk-2.0 ] && %{_bindir}/gdk-pixbuf-query-loaders%{arch_suffix} > %{_sysconfdir}/gtk-2.0/gdk-pixbuf.loaders || : -%ifarch %{ix86} - fi -%endif -fi : %postun @@ -149,6 +140,7 @@ fi : %posttrans +if [ $1 -ge 1 ]; then %ifarch %{ix86} if [ ! -e /usr/lib64/gdk-pixbuf-2.0/2.10.0/loaders.cache ]; then %endif @@ -156,9 +148,23 @@ fi %ifarch %{ix86} fi %endif +%{_bindir}/gdk-pixbuf-query-loaders%{arch_suffix} --update-cache || : +[ -e %{_sysconfdir}/gtk-3.0 ] && { + mkdir -p %{_sysconfdir}/gtk-3.0/%{_target_platform} + %{_bindir}/gdk-pixbuf-query-loaders%{arch_suffix} > %{_sysconfdir}/gtk-3.0/%{_target_platform}/gdk-pixbuf.loaders || : +} +[ -e %{_sysconfdir}/gtk-2.0 ] && { + mkdir -p %{_sysconfdir}/gtk-2.0/%{_target_platform} + %{_bindir}/gdk-pixbuf-query-loaders%{arch_suffix} > %{_sysconfdir}/gtk-2.0/%{_target_platform}/gdk-pixbuf.loaders || : +} +fi +# legacy cleanups +rm -f /etc/gtk-2.0/gdk-pixbuf.loaders +rm -f /etc/gtk-3.0/gdk-pixbuf.loaders : %posttrans devel +if [ $1 -ge 1 ]; then %ifarch %{ix86} if [ ! -e /usr/lib64/gdk-pixbuf-2.0/2.10.0/loaders.cache ]; then %endif @@ -167,6 +173,7 @@ fi %ifarch %{ix86} fi %endif +fi : %post -n lib32-%{name} -p /sbin/ldconfig @@ -231,6 +238,9 @@ fi #%endif %changelog +* Thu May 28 2015 Silvan Calarco 2.30.8-5mamba +- multiarch cohexistence of gdk-pixbuf.loaders + * Fri Apr 03 2015 Silvan Calarco 2.30.8-4mamba - fix postgrans creation of gtk-pixbuf-{csource,pixdata} links