From 9c08122c5a1372a82f149b3c550aafaa75ad88919067780bb65d6f6671bc427b Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Thu, 7 Jul 2011 09:14:15 +0000
Subject: [PATCH] Accepting request 75630 from
 home:vuntz:branches:GNOME:Factory

Fix build + complete branding doc

OBS-URL: https://build.opensuse.org/request/show/75630
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/glib2?expand=0&rev=150
---
 glib2.spec | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/glib2.spec b/glib2.spec
index 796dbdc..bf60854 100644
--- a/glib2.spec
+++ b/glib2.spec
@@ -110,8 +110,11 @@ Supplements:    packageand(libgio-2_0-0:branding-upstream)
 BuildArch:      noarch
 #BRAND: The /etc/gnome_defaults.conf allows to define arbitrary
 #BRAND: applications as preferred defaults.
-#BRAND: A /usr/share/glib-2.0/schemas/$NAME.gschema.override can be
-#BRAND: used to override the default value for a GSettings key.
+#BRAND: A /usr/share/glib-2.0/schemas/$NAME.gschema.override file can
+#BRAND: be used to override the default value for GSettings keys. See
+#BRAND: README.Gsettings-overrides for more details. The branding
+#BRAND: package should then have proper Requires for features changed
+#BRAND: with such an override file.
 # NOTE: gnome_defaults is not an upstream feature, but a SuSE
 # enhancement, but to conform branding conventions, the package is named
 # as gio-branding-upstream.
@@ -267,10 +270,10 @@ translation-update-upstream
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
-cp -a %{S:1} %{S:2} %{S:3} .
+cp -a %{S:1} %{S:2} %{S:3} %{S:5} .
 cp -a %{S:4} gnome_defaults.conf
 if ! test -f %{_datadir}/aclocal/gtk-doc.m4 ; then
-    cp -a %{S:6} m4macros/
+    cp -a %{S:7} m4macros/
 fi
 %if 0%{?BUILD_FROM_VCS}
 NOCONFIGURE=1 ./autogen.sh
@@ -326,7 +329,7 @@ find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print
 rm %{buildroot}%{_libdir}/gio/modules/libgiofam.a
 # Install rpm macros
 mkdir -p %{buildroot}%{_sysconfdir}/rpm
-cp %{S:5} %{buildroot}%{_sysconfdir}/rpm
+cp %{S:6} %{buildroot}%{_sysconfdir}/rpm
 %fdupes %{buildroot}
 
 %posttrans