Accepting request 50509 from home:vuntz:branches:GNOME:Factory

OBS-URL: https://build.opensuse.org/request/show/50509
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/pango?expand=0&rev=59

pango.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Wed Oct 13 20:26:17 CEST 2010 - vuntz@opensuse.org
+
+- Do not call pango-querymodules twice in the %post of
+  libpango-1_0-0. Especially since the first call might fail since
+  it's not in the if test.
+- Put comments that are in the scriptlets area of the spec file in
+  "%if 0" statement: if we don't do that, they actually end up in
+  the scriplets and can even make them fail if the scriptlets were
+  just "-p /sbin/ldconfig".
+
 -------------------------------------------------------------------
 Mon Oct 11 16:39:05 CEST 2010 - vuntz@opensuse.org
 

pango.spec

@@ -161,20 +161,22 @@ rm -rf %{buildroot}
 %define _pango_querymodules_update_cache %{_pango_querymodules} > %{_sysconfdir}/pango/pango.modules
 %endif
 
+%post -n libpango-1_0-0
+/sbin/ldconfig
+%if 0
 # In case libpango-1_0-0 gets installed before pango-tools, we don't want to
 # fail. So we make the call to pango-querymodules dependent on the existence of
 # the binary. This is why we also have a %post for pango-tools.
-
-%post -n libpango-1_0-0
-/sbin/ldconfig
-%{_pango_querymodules_update_cache}
+%endif
 if test -f %{_pango_querymodules}; then
   %{_pango_querymodules_update_cache}
 fi
 
+%if 0
 # No need to call pango-querymodules in postun:
 # - if it's an upgrade, it will have been called in post
 # - if it's an uninstall, we don't care about this anymore
+%endif
 
 %postun -n libpango-1_0-0 -p /sbin/ldconfig
 
@@ -184,12 +186,13 @@ fi
 %postun module-thai-lang
 %{_pango_querymodules_update_cache}
 
+%post tools
+%if 0
 # If we install pango-tools for the first time, then we should run it in case
 # libpango-1_0-0 was installed first (ie, if
 # %{_libdir}/pango/%{pango_binary_version} already exists) which means
 # pango-querymodules couldn't run there.
-
-%post tools
+%endif
 if [ $1 == 1 ]; then
   test -d %{_libdir}/pango/%{pango_binary_version}
   if test $? -eq 0; then