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

Update branding doc

OBS-URL: https://build.opensuse.org/request/show/75623
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=166
---
 gdm.changes | 2 ++
 gdm.spec    | 7 +++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/gdm.changes b/gdm.changes
index 5d82ca6..3596a86 100644
--- a/gdm.changes
+++ b/gdm.changes
@@ -8,6 +8,8 @@ Wed Jul  6 16:34:12 CEST 2011 - vuntz@opensuse.org
   + Make noarch.
 - Change branding Requires in main subpackage to be "= %{version}"
   since it has to be versioned.
+- Update branding documentation: there is only one file left in the
+  branding package.
 - Update Url tag.
 
 -------------------------------------------------------------------
diff --git a/gdm.spec b/gdm.spec
index 88b33a4..a801168 100644
--- a/gdm.spec
+++ b/gdm.spec
@@ -143,10 +143,9 @@ Provides:       %{name}-branding = %{version}
 Conflicts:      otherproviders(%{name}-branding)
 Supplements:    packageand(%{name}:branding-upstream)
 BuildArch:      noarch
-#BRAND: Provide two equal files - /usr/share/gdm/defaults.conf and
-#BRAND: factory-defaults.conf with default configuration of gdm.
-#BRAND: Branding package requires the package with the default theme.
-#NOTE: We may want to create gdm-themes with upstream themes.
+#BRAND: Provide one file:
+#BRAND: /etc/gdm/custom.conf
+#BRAND:   Default configuration of gdm
 
 %description branding-upstream
 The GNOME Display Manager is a system service that is responsible for