From e00a2d8915f6243311b09609289ec54913037a381e91e51ad6e9172c4d72d91e Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@opensuse.org>
Date: Thu, 14 Oct 2010 07:48:09 +0000
Subject: [PATCH] Accepting request 50511 from
 home:vuntz:branches:GNOME:Factory

OBS-URL: https://build.opensuse.org/request/show/50511
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk3?expand=0&rev=12
---
 gtk3.changes | 11 +++++++++++
 gtk3.spec    | 24 ++++++++++++++++--------
 2 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/gtk3.changes b/gtk3.changes
index 91b2374..41c2a89 100644
--- a/gtk3.changes
+++ b/gtk3.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Wed Oct 13 20:24:01 CEST 2010 - vuntz@opensuse.org
+
+- Change hicolor-icon-theme Recommends to a Requires in
+  libgtk-3-0_0 since we need to make sure it gets installed, and
+  libgtk-3-0_0 is low-level enough for this.
+- 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 13:44:31 CEST 2010 - vuntz@opensuse.org
 
diff --git a/gtk3.spec b/gtk3.spec
index ad242f9..f37892a 100644
--- a/gtk3.spec
+++ b/gtk3.spec
@@ -73,9 +73,12 @@ ranging from small one-off projects to complete application suites.
 License:        LGPLv2.1+
 Summary:        The GTK+ toolkit library (version 3)
 Group:          System/Libraries
-# Provide %{name} to make the lang and immodules packages installable
-Provides:       %{name} = %{version}
 Requires(post): %{name}-tools
+# While hicolor is not a Requires strictly speaking, we put it as
+# such instead of as a Recommends because many applications just
+# assume it's there and we need to have a low-level package to
+# bring it in.
+Requires:       hicolor-icon-theme
 # gtk+ can work without branding/data/translations. Built in defaults will be used then.
 Recommends:     %{name}-branding
 Recommends:     %{name}-data = %{version}
@@ -87,7 +90,8 @@ Recommends:     %{name}-immodule-tigrigna = %{version}
 Recommends:     %{name}-immodule-vietnamese = %{version}
 Recommends:     %{name}-lang
 Recommends:     gvfs
-Recommends:     hicolor-icon-theme
+# Provide %{name} to make the lang and immodules packages installable
+Provides:       %{name} = %{version}
 
 %description -n libgtk-3_0-0
 GTK+ is a multi-platform toolkit for creating graphical user interfaces.
@@ -314,12 +318,13 @@ rm -rf %{buildroot}
 %endif
 %define _gtk_query_immodules_update_cache %{_gtk_query_immodules} --update-cache
 
+%post -n libgtk-3_0-0
+/sbin/ldconfig
+%if 0
 # In case libgtk-3_0-0 gets installed before gtk3-tools, we don't want to fail.
 # So we make the call to gtk-query-immodules-3.0 dependent on the existence of
 # the binary. This is why we also have a %post for gtk3-tools.
-
-%post -n libgtk-3_0-0
-/sbin/ldconfig
+%endif
 if test -f %{_gtk_query_immodules}; then
   %{_gtk_query_immodules_update_cache}
 fi
@@ -345,12 +350,13 @@ fi
 %post immodule-xim
 %{_gtk_query_immodules_update_cache}
 
+%post tools
+%if 0
 # If we install gtk3-tools for the first time, then we should run it in case
 # libgtk-3_0-0 was installed first (ie, if
 # %{_libdir}/gtk-3.0/%{gtk_binary_version} already exists) which means
 # gtk-query-immodules-3.0 couldn't run there.
-
-%post tools
+%endif
 if [ $1 == 1 ]; then
   test -d %{_libdir}/gtk-3.0/%{gtk_binary_version}
   if test $? -eq 0; then
@@ -358,9 +364,11 @@ if [ $1 == 1 ]; then
   fi
 fi
 
+%if 0
 # No need to call gtk-query-immodules-3.0 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 libgtk-3_0-0 -p /sbin/ldconfig