use -32 or -64 suffix as more widely used [release 2.30.8-3mamba;Tue Mar 31 2015]

libgdk-pixbuf.spec

@@ -1,9 +1,15 @@
 %define majversion %(echo %version | cut -d. -f 1-2)
 
+%ifarch x86_64
+%define arch_suffix -64
+%else
+%define arch_suffix -32
+%endif
+
 Name:          libgdk-pixbuf
 Epoch:         1
 Version:       2.30.8
-Release:       2mamba
+Release:       3mamba
 Summary:       An image loading library
 Group:         System/Libraries
 Vendor:        openmamba
@@ -29,7 +35,7 @@ BuildRequires: libtiff-devel
 BuildRequires: libxcb-devel
 BuildRequires: libz-devel
 ## AUTOBUILDREQ-END
-BuildRequires: libdb47-devel
+#BuildRequires: libdb47-devel
 BuildRequires: vim
 #%ifarch x86_64
 #BuildRequires: gcc-multilib
@@ -89,7 +95,7 @@ This package contains %{name} API documentation.
    --enable-gtk-doc \
    --with-libjasper \
    --with-x11 \
-   --program-suffix=-%{_target_cpu}
+   --program-suffix=%{arch_suffix}
 
 %make
 
@@ -100,9 +106,6 @@ 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
@@ -129,13 +132,12 @@ ln -snf gdk-pixbuf-pixdata-%{_target_cpu} %{buildroot}%{_bindir}/gdk-pixbuf-pixd
 %post
 /sbin/ldconfig
 if [ $1 -ge 1 ]; then
-   %{_bindir}/gdk-pixbuf-query-loaders-%{_target_cpu} --update-cache || :
+   %{_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-%{_target_cpu} > %{_sysconfdir}/gtk-3.0/gdk-pixbuf.loaders || :
+   [ -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-%{_target_cpu} > %{_sysconfdir}/gtk-2.0/gdk-pixbuf.loaders || :
+   [ -e %{_sysconfdir}/gtk-2.0 ] && %{_bindir}/gdk-pixbuf-query-loaders%{arch_suffix} > %{_sysconfdir}/gtk-2.0/gdk-pixbuf.loaders || :
-   ln -snf gdk-pixbuf-query-loaders-%{_target_cpu} %{_bindir}/gdk-pixbuf-query-loaders
 %ifarch %{ix86}
    fi
 %endif
@@ -144,17 +146,27 @@ fi
 
 %postun
 /sbin/ldconfig
-if [ $1 -gt 0 ]; then
+:
-   %{_bindir}/gdk-pixbuf-query-loaders-%{_target_cpu} --update-cache || :
+
+%posttrans
 %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 || :
+   ln -snf gdk-pixbuf-query-loaders%{arch_suffix} %{_bindir}/gdk-pixbuf-query-loaders
-   [ -e %{_sysconfdir}/gtk-2.0 ] && %{_bindir}/gdk-pixbuf-query-loaders-%{_target_cpu} > %{_sysconfdir}/gtk-2.0/gdk-pixbuf.loaders || :
+%ifarch %{ix86}
+   fi
+%endif
+:
+
+%posttrans devel
+%ifarch %{ix86}
+   if [ ! -e /usr/lib64/gdk-pixbuf-2.0/2.10.0/loaders.cache ]; then
+%endif
+   ln -snf gdk-pixbuf-csource%{arch_suffix} %{buildroot}%{_bindir}/gdk-pixbuf-csource
+   ln -snf gdk-pixbuf-pixdata%{arch_suffix} %{buildroot}%{_bindir}/gdk-pixbuf-pixdata
 %ifarch %{ix86}
    fi
 %endif
-fi
 :
 
 %post -n lib32-%{name} -p /sbin/ldconfig
@@ -162,7 +174,7 @@ fi
 
 %files -f gdk-pixbuf.lang
 %defattr(-,root,root)
-%{_bindir}/gdk-pixbuf-query-loaders-%{_target_cpu}
+%{_bindir}/gdk-pixbuf-query-loaders%{arch_suffix}
 %{_libdir}/libgdk_pixbuf-2.0.so.*
 %{_libdir}/libgdk_pixbuf_xlib-2.0.so.*
 %dir %{_libdir}/gdk-pixbuf-2.0
@@ -171,15 +183,13 @@ 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-%{_target_cpu}.1*
+%{_mandir}/man1/gdk-pixbuf-query-loaders%{arch_suffix}.1*
 %doc AUTHORS COPYING
 
 %files devel
 %defattr(-,root,root)
-%{_bindir}/gdk-pixbuf-csource
+%{_bindir}/gdk-pixbuf-csource%{arch_suffix}
-%{_bindir}/gdk-pixbuf-csource-%{_target_cpu}
+%{_bindir}/gdk-pixbuf-pixdata%{arch_suffix}
-%{_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
@@ -193,7 +203,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-%{_target_cpu}.1*
+%{_mandir}/man1/gdk-pixbuf-csource%{arch_suffix}.1*
 %doc NEWS
 
 %files apidocs
@@ -221,6 +231,9 @@ fi
 #%endif
 
 %changelog
+* Tue Mar 31 2015 Silvan Calarco <silvan.calarco@mambasoft.it> 2.30.8-3mamba
+- use -32 or -64 suffix as more widely used
+
 * Thu Mar 26 2015 Silvan Calarco <silvan.calarco@mambasoft.it> 2.30.8-2mamba
 - provide gdk-pixbuf-query-loaders with arch suffix to support biarch environment