From 7cabdcee20a1f4bd221ba21d3ec612cec2847c8b Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 19 May 2012 01:20:29 -0400 Subject: [PATCH] fix up scriptlet dependencies --- pango.spec | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/pango.spec b/pango.spec index 0f23901..800bc7b 100644 --- a/pango.spec +++ b/pango.spec @@ -9,7 +9,7 @@ Summary: System for layout and rendering of internationalized text Name: pango Version: 1.30.0 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ Group: System Environment/Libraries #VCS: git:git://git.gnome.org/pango @@ -21,6 +21,8 @@ Requires: freetype >= %{freetype_version} Requires: freetype >= %{freetype_version} Requires: cairo >= %{cairo_version} Requires: libthai >= %{libthai_version} +Requires(post): sed +Requires(postun): sed BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: pkgconfig >= %{pkgconfig_version} BuildRequires: freetype-devel >= %{freetype_version} @@ -166,14 +168,7 @@ host=`echo $host | sed "s/^ppc/powerpc/"` # autoconf uses ibm-linux not redhat-linux on s390x host=`echo $host | sed "s/^s390\(x\)*-redhat/s390\1-ibm/"` -case "$host" in - alpha*|ia64*|powerpc64*|s390x*|sparc64*|x86_64*) - %{_bindir}/pango-querymodules-64 > %{_sysconfdir}/pango/$host/pango.modules - ;; - *) - %{_bindir}/pango-querymodules-32 > %{_sysconfdir}/pango/$host/pango.modules - ;; -esac +%{_bindir}/pango-querymodules-%{__isa_bits} > %{_sysconfdir}/pango/$host/pango.modules || : %postun /sbin/ldconfig @@ -196,14 +191,7 @@ host=`echo $host | sed "s/^ppc/powerpc/"` # autoconf uses ibm-linux not redhat-linux (s390x) host=`echo $host | sed "s/^s390\(x\)*-redhat/s390\1-ibm/"` -case "$host" in - alpha*|ia64*|powerpc64*|s390x*|sparc64*|x86_64*) - %{_bindir}/pango-querymodules-64 > %{_sysconfdir}/pango/$host/pango.modules || : - ;; - *) - %{_bindir}/pango-querymodules-32 > %{_sysconfdir}/pango/$host/pango.modules || : - ;; -esac +%{_bindir}/pango-querymodules-%{__isa_bits} > %{_sysconfdir}/pango/$host/pango.modules || : fi @@ -238,6 +226,9 @@ fi %changelog +* Sat May 19 2012 Matthias Clasen - 1.30.0-2 +- Fix up scriptlet dependencies (#684729) + * Wed Mar 28 2012 Richard Hughes - 1.30.0-1 - Update to 1.30.0