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

OBS-URL: https://build.opensuse.org/request/show/50504
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdk-pixbuf?expand=0&rev=14

gdk-pixbuf.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Oct 13 20:21:06 CEST 2010 - vuntz@opensuse.org
+
+- 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".
+
 -------------------------------------------------------------------
 Tue Oct 12 00:13:44 CEST 2010 - vuntz@opensuse.org
 

gdk-pixbuf.spec

@@ -122,23 +122,25 @@ cp %{S:1} %{buildroot}%{_sysconfdir}/rpm
 %endif
 %define _gdk_pixbuf_query_loaders_update_cache %{_gdk_pixbuf_query_loaders} --update-cache
 
+%post -n libgdk_pixbuf-2_0-0
+/sbin/ldconfig
+%if 0
 # In case libgdk_pixbuf-2_0-0 gets installed before gdk-pixbuf-query-loaders,
 # we don't want to fail. So we make the call to gdk-pixbuf-query-loaders
 # dependent on the existence of the binary. This is why we also have a %post
 # for gdk-pixbuf-query-loaders.
-
-%post -n libgdk_pixbuf-2_0-0
-/sbin/ldconfig
+%endif
 if test -f %{_gdk_pixbuf_query_loaders}; then
   %{_gdk_pixbuf_query_loaders_update_cache}
 fi
 
+%post query-loaders
+%if 0
 # If we install gdk-pixbuf-query-loaders for the first time, then we should run
 # it in case libgdk_pixbuf-2_0-0 was installed first (ie, if
 # %{_libdir}/gdk-pixbuf-2.0/%{gdk_pixbuf_binary_version} already exists) which
 # means gdk-pixbuf-query-loaders couldn't run there.
-
-%post query-loaders
+%endif
 if [ $1 == 1 ]; then
   test -d %{_libdir}/gdk-pixbuf-2.0/%{gdk_pixbuf_binary_version}
   if test $? -eq 0; then
@@ -146,9 +148,11 @@ if [ $1 == 1 ]; then
   fi
 fi
 
+%if 0
 # No need to call gdk-pixbuf-query-loaders 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 libgdk_pixbuf-2_0-0 -p /sbin/ldconfig