From 49782ebcefc5c14da678567359c544918c186ab7 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sat, 6 Jan 2024 04:21:14 +0100 Subject: [PATCH] provide gdk-pixbuf-query-loaders with arch suffix to support biarch environment [release 2.30.8-2mamba;Thu Mar 26 2015] --- libgdk-pixbuf.spec | 140 ++++++++++++++++++++++++++------------------- 1 file changed, 81 insertions(+), 59 deletions(-) diff --git a/libgdk-pixbuf.spec b/libgdk-pixbuf.spec index 50f1a6a..253f4a6 100644 --- a/libgdk-pixbuf.spec +++ b/libgdk-pixbuf.spec @@ -3,7 +3,7 @@ Name: libgdk-pixbuf Epoch: 1 Version: 2.30.8 -Release: 1mamba +Release: 2mamba Summary: An image loading library Group: System/Libraries Vendor: openmamba @@ -14,6 +14,9 @@ Source: ftp://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/%{majversion}/gd License: GPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel +BuildRequires: libX11-devel +BuildRequires: libXau-devel +BuildRequires: libXdmcp-devel BuildRequires: libffi-devel BuildRequires: libglib-devel BuildRequires: libjasper-devel @@ -21,26 +24,21 @@ BuildRequires: libjbig-devel BuildRequires: libjpeg-devel BuildRequires: liblzma-devel BuildRequires: libpng-devel -BuildRequires: libpthread-stubs-devel BuildRequires: libselinux-devel BuildRequires: libtiff-devel -BuildRequires: libX11-devel -BuildRequires: libXau-devel BuildRequires: libxcb-devel -BuildRequires: libXdmcp-devel BuildRequires: libz-devel ## AUTOBUILDREQ-END BuildRequires: libdb47-devel -BuildRequires: libjbig-devel BuildRequires: vim -%ifarch x86_64 -BuildRequires: gcc-multilib -BuildRequires: glibc-multilib-devel -BuildRequires: lib32-libglib-devel -BuildRequires: lib32-libpng-devel -BuildRequires: lib32-libjpeg-turbo-devel -BuildRequires: lib32-libtiff-devel -%endif +#%ifarch x86_64 +#BuildRequires: gcc-multilib +#BuildRequires: glibc-multilib-devel +#BuildRequires: lib32-libglib-devel +#BuildRequires: lib32-libpng-devel +#BuildRequires: lib32-libjpeg-turbo-devel +#BuildRequires: lib32-libtiff-devel +#%endif BuildRoot: %{_tmppath}/%{name}-%{version}-root # checking for mediaLib 2.3... checking for mlib_ImageSetStruct in -lmlib... no @@ -88,9 +86,11 @@ This package contains %{name} API documentation. %build %configure \ - --enable-gtk-doc \ - --with-libjasper \ - --with-x11 + --enable-gtk-doc \ + --with-libjasper \ + --with-x11 \ + --program-suffix=-%{_target_cpu} + %make %install @@ -100,24 +100,28 @@ This package contains %{name} API documentation. touch %{buildroot}%{_libdir}/gdk-pixbuf-2.0/2.10.0/loaders.cache +ln -snf gdk-pixbuf-csource-%{_target_cpu} %{buildroot}%{_bindir}/gdk-pixbuf-csource +ln -snf gdk-pixbuf-pixdata-%{_target_cpu} %{buildroot}%{_bindir}/gdk-pixbuf-pixdata + %find_lang gdk-pixbuf -%ifarch x86_64 -# x86_64 lib64 support -make clean -CC=%{_target_platform}-gcc \ -CFLAGS="%{optflags} -m32" \ -CXXFLAGS="%{optflags} -m32" \ -./configure \ - --prefix=%{_prefix} \ - --libdir=%{_prefix}/lib \ - --with-x11 \ - --disable-introspection - -make -make install DESTDIR=`pwd`/lib32 RUN_QUERY_LOADER_TEST=false -cp -a lib32/%{_prefix}/lib %{buildroot}%{_prefix}/ -%endif +#%ifarch x86_64 +## x86_64 lib64 support +#make clean +#CC=%{_target_platform}-gcc \ +#CFLAGS="%{optflags} -m32" \ +#CXXFLAGS="%{optflags} -m32" \ +#./configure \ +# --prefix=%{_prefix} \ +# --libdir=%{_prefix}/lib \ +# --with-x11 \ +# --disable-introspection \ +# --program-suffix=-i586 +# +#make +#make install DESTDIR=`pwd`/lib32 RUN_QUERY_LOADER_TEST=false +#cp -a lib32/%{_prefix}/lib %{buildroot}%{_prefix}/ +#%endif %clean [ "%{buildroot}" != / ] && rm -rf %{buildroot} @@ -125,18 +129,31 @@ cp -a lib32/%{_prefix}/lib %{buildroot}%{_prefix}/ %post /sbin/ldconfig if [ $1 -ge 1 ]; then - %{_bindir}/gdk-pixbuf-query-loaders --update-cache || : - [ -e %{_sysconfdir}/gtk-3.0 ] && %{_bindir}/gdk-pixbuf-query-loaders > %{_sysconfdir}/gtk-3.0/gdk-pixbuf.loaders || : - [ -e %{_sysconfdir}/gtk-2.0 ] && %{_bindir}/gdk-pixbuf-query-loaders > %{_sysconfdir}/gtk-2.0/gdk-pixbuf.loaders || : + %{_bindir}/gdk-pixbuf-query-loaders-%{_target_cpu} --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-%{_target_cpu} > %{_sysconfdir}/gtk-3.0/gdk-pixbuf.loaders || : + [ -e %{_sysconfdir}/gtk-2.0 ] && %{_bindir}/gdk-pixbuf-query-loaders-%{_target_cpu} > %{_sysconfdir}/gtk-2.0/gdk-pixbuf.loaders || : + ln -snf gdk-pixbuf-query-loaders-%{_target_cpu} %{_bindir}/gdk-pixbuf-query-loaders +%ifarch %{ix86} + fi +%endif fi : %postun /sbin/ldconfig if [ $1 -gt 0 ]; then - %{_bindir}/gdk-pixbuf-query-loaders --update-cache || : - [ -e %{_sysconfdir}/gtk-3.0 ] && %{_bindir}/gdk-pixbuf-query-loaders > %{_sysconfdir}/gtk-3.0/gdk-pixbuf.loaders || : - [ -e %{_sysconfdir}/gtk-2.0 ] && %{_bindir}/gdk-pixbuf-query-loaders > %{_sysconfdir}/gtk-2.0/gdk-pixbuf.loaders || : + %{_bindir}/gdk-pixbuf-query-loaders-%{_target_cpu} --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-%{_target_cpu} > %{_sysconfdir}/gtk-3.0/gdk-pixbuf.loaders || : + [ -e %{_sysconfdir}/gtk-2.0 ] && %{_bindir}/gdk-pixbuf-query-loaders-%{_target_cpu} > %{_sysconfdir}/gtk-2.0/gdk-pixbuf.loaders || : +%ifarch %{ix86} + fi +%endif fi : @@ -145,7 +162,7 @@ fi %files -f gdk-pixbuf.lang %defattr(-,root,root) -%{_bindir}/gdk-pixbuf-query-loaders +%{_bindir}/gdk-pixbuf-query-loaders-%{_target_cpu} %{_libdir}/libgdk_pixbuf-2.0.so.* %{_libdir}/libgdk_pixbuf_xlib-2.0.so.* %dir %{_libdir}/gdk-pixbuf-2.0 @@ -154,13 +171,15 @@ fi %{_libdir}/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-*.so %ghost %{_libdir}/gdk-pixbuf-2.0/2.10.0/loaders.cache %{_libdir}/girepository-1.0/GdkPixbuf-2.0.typelib -%{_mandir}/man1/gdk-pixbuf-query-loaders.1.gz +%{_mandir}/man1/gdk-pixbuf-query-loaders-%{_target_cpu}.1* %doc AUTHORS COPYING %files devel %defattr(-,root,root) %{_bindir}/gdk-pixbuf-csource +%{_bindir}/gdk-pixbuf-csource-%{_target_cpu} %{_bindir}/gdk-pixbuf-pixdata +%{_bindir}/gdk-pixbuf-pixdata-%{_target_cpu} %dir %{_includedir}/gdk-pixbuf-2.0 %dir %{_includedir}/gdk-pixbuf-2.0/gdk-pixbuf %{_includedir}/gdk-pixbuf-2.0/gdk-pixbuf/*.h @@ -174,7 +193,7 @@ fi %{_datadir}/gir-1.0/GdkPixbuf-2.0.gir %{_libdir}/pkgconfig/gdk-pixbuf-2.0.pc %{_libdir}/pkgconfig/gdk-pixbuf-xlib-2.0.pc -%{_mandir}/man1/gdk-pixbuf-csource.1.gz +%{_mandir}/man1/gdk-pixbuf-csource-%{_target_cpu}.1* %doc NEWS %files apidocs @@ -182,26 +201,29 @@ fi %dir %{_datadir}/gtk-doc/html/gdk-pixbuf %{_datadir}/gtk-doc/html/gdk-pixbuf/* -%ifarch x86_64 -%files -n lib32-%{name} -%defattr(-,root,root) -%{_prefix}/lib/libgdk_pixbuf-2.0.so.* -%{_prefix}/lib/libgdk_pixbuf_xlib-2.0.so.* -%dir %{_prefix}/lib/gdk-pixbuf-2.0/2.10.0/loaders -%{_prefix}/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-*.so +#%ifarch x86_64 +#%files -n lib32-%{name} +#%defattr(-,root,root) +#%{_prefix}/lib/libgdk_pixbuf-2.0.so.* +#%{_prefix}/lib/libgdk_pixbuf_xlib-2.0.so.* +#%dir %{_prefix}/lib/gdk-pixbuf-2.0/2.10.0/loaders +#%{_prefix}/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-*.so -%files -n lib32-%{name}-devel -%defattr(-,root,root) -%{_prefix}/lib/libgdk_pixbuf-2.0.so -%{_prefix}/lib/libgdk_pixbuf_xlib-2.0.so -%{_prefix}/lib/libgdk_pixbuf-2.0.la -%{_prefix}/lib/libgdk_pixbuf_xlib-2.0.la -%{_prefix}/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-*.la -%{_prefix}/lib/pkgconfig/gdk-pixbuf-2.0.pc -%{_prefix}/lib/pkgconfig/gdk-pixbuf-xlib-2.0.pc -%endif +#%files -n lib32-%{name}-devel +#%defattr(-,root,root) +#%{_prefix}/lib/libgdk_pixbuf-2.0.so +#%{_prefix}/lib/libgdk_pixbuf_xlib-2.0.so +#%{_prefix}/lib/libgdk_pixbuf-2.0.la +#%{_prefix}/lib/libgdk_pixbuf_xlib-2.0.la +#%{_prefix}/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-*.la +#%{_prefix}/lib/pkgconfig/gdk-pixbuf-2.0.pc +#%{_prefix}/lib/pkgconfig/gdk-pixbuf-xlib-2.0.pc +#%endif %changelog +* Thu Mar 26 2015 Silvan Calarco 2.30.8-2mamba +- provide gdk-pixbuf-query-loaders with arch suffix to support biarch environment + * Tue May 27 2014 Automatic Build System 2.30.8-1mamba - automatic version update by autodist