From ac613a0a255d6966929b89690a4c8dd36baf5db1a685f2bcae8ea58618cf7aae Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Wed, 7 May 2008 22:31:59 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pango?expand=0&rev=20 --- baselibs.conf | 4 ++-- pango.changes | 6 ++++++ pango.spec | 11 ++++++++--- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/baselibs.conf b/baselibs.conf index ca40a25..6852bc1 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -4,11 +4,11 @@ pango prereq "filesystem glib2 xorg-x11-libs xorg-x11-libXrender xorg-x11-libX11" postun "/sbin/ldconfig" targettype 64bit postun "if [ -x usr/bin/pango-querymodules-64 ] ; then" - targettype 64bit postun "LD_LIBRARY_PATH=usr/lib64 usr/bin/pango-querymodules-64 > etc/pango/pango64.modules" + targettype 64bit postun "LD_LIBRARY_PATH=usr/lib64 usr/bin/pango-querymodules-64 > etc/pango/pango64.modules || echo pango-querymodules-64 did not run properly in postun." targettype 64bit postun "fi" targettype 32bit postun "if [ -x usr/bin/pango-querymodules ] ; then" targettype 32bit postun "LD_LIBRARY_PATH=usr/lib usr/bin/pango-querymodules > etc/pango/pango.modules" targettype 32bit postun "fi" - targettype 64bit post "LD_LIBRARY_PATH=usr/lib64 usr/bin/pango-querymodules-64 > etc/pango/pango64.modules" + targettype 64bit post "LD_LIBRARY_PATH=usr/lib64 usr/bin/pango-querymodules-64 > etc/pango/pango64.modules || echo pango-querymodules-64 did not run properly in postin." targettype 32bit post "LD_LIBRARY_PATH=usr/lib usr/bin/pango-querymodules > etc/pango/pango.modules" arch ppc64 package pango-devel diff --git a/pango.changes b/pango.changes index af9b550..f88bfa5 100644 --- a/pango.changes +++ b/pango.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed May 7 09:21:25 CEST 2008 - olh@suse.de + +- execution failure of pango-querymodules-64 on 32bit systems is + not fatal (bnc#301792) + ------------------------------------------------------------------- Tue May 6 14:09:27 CEST 2008 - schwab@suse.de diff --git a/pango.spec b/pango.spec index dc5b2fe..aec67fb 100644 --- a/pango.spec +++ b/pango.spec @@ -17,7 +17,7 @@ License: LGPL v2.1 or later Group: System/Libraries AutoReqProv: on Version: 1.20.1 -Release: 11 +Release: 12 Summary: System for Layout and Rendering of Internationalised Text Source: ftp://ftp.gnome.org/pub/GNOME/sources/pango/1.18/%{name}-%{version}.tar.bz2 Source1: README.SuSE @@ -123,9 +123,10 @@ rm -rf $RPM_BUILD_ROOT %post /sbin/ldconfig %if "%_lib" == "lib64" + # it is not fatal if execution fails on 32bit systems LD_LIBRARY_PATH=usr/%{_lib}\ usr/bin/pango-querymodules-64\ - > etc/pango/pango64.modules + > etc/pango/pango64.modules || echo "pango-querymodules-64 did not run properly in postin." %else LD_LIBRARY_PATH=usr/%{_lib}\ usr/bin/pango-querymodules\ @@ -136,9 +137,10 @@ LD_LIBRARY_PATH=usr/%{_lib}\ /sbin/ldconfig %if "%_lib" == "lib64" if [ -x usr/bin/pango-querymodules-64 ] ; then + # it is not fatal if execution fails on 32bit systems LD_LIBRARY_PATH=usr/%{_lib}\ usr/bin/pango-querymodules-64\ - > etc/pango/pango64.modules + > etc/pango/pango64.modules || echo "pango-querymodules-64 did not run properly in postun." fi %else if [ -x usr/bin/pango-querymodules ] ; then @@ -184,6 +186,9 @@ fi %{_datadir}/gtk-doc/html/pango %changelog +* Wed May 07 2008 olh@suse.de +- execution failure of pango-querymodules-64 on 32bit systems is + not fatal (bnc#301792) * Tue May 06 2008 schwab@suse.de - Don't use libtool before it is created. * Sat Apr 12 2008 maw@suse.de