From fafc80dd4e00e046a7c7c905c27a7bd3658a1554b8dded2f5a66af5bd39d811d Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Thu, 11 Apr 2013 22:10:30 +0000
Subject: [PATCH] Accepting request 163604 from
 home:dimstar:branches:GNOME:Factory

Add the g-c-c branding obsoletes to GF as well - Seems to work in G:S after all

OBS-URL: https://build.opensuse.org/request/show/163604
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-control-center?expand=0&rev=184
---
 g-c-c-online-accounts.patch  | 12 ------------
 gnome-control-center.changes | 10 ++++++++++
 gnome-control-center.spec    |  4 ++++
 3 files changed, 14 insertions(+), 12 deletions(-)
 delete mode 100644 g-c-c-online-accounts.patch

diff --git a/g-c-c-online-accounts.patch b/g-c-c-online-accounts.patch
deleted file mode 100644
index 760436e..0000000
--- a/g-c-c-online-accounts.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/panels/online-accounts/cc-online-accounts-panel.c b/panels/online-accounts/cc-online-accounts-panel.c
-index 5b0028d..9078008 100644
---- a/panels/online-accounts/cc-online-accounts-panel.c
-+++ b/panels/online-accounts/cc-online-accounts-panel.c
-@@ -35,6 +35,7 @@
- 
- #include "cc-online-accounts-add-account-dialog.h"
- #include "cc-online-accounts-model.h"
-+#include "cc-online-accounts-resources.h"
- 
- typedef struct _CcGoaPanelClass CcGoaPanelClass;
- 
diff --git a/gnome-control-center.changes b/gnome-control-center.changes
index 67eae58..3f319e4 100644
--- a/gnome-control-center.changes
+++ b/gnome-control-center.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Thu Apr 11 10:00:48 UTC 2013 - dimstar@opensuse.org
+
+- Obsolete gnome-control-center-branding <= 12.3: as there is no
+  branding package left for g-c-c, we need to obsolete it for a
+  clean upgrade path.
+- Also explicitly obsolete gnome-control-center-branding-upstream
+  and gnome-control-center-branding-openSUSE.
+- Really drop g-c-c-online-accounts.patch.
+
 -------------------------------------------------------------------
 Sat Mar 30 14:38:16 UTC 2013 - dimstar@opensuse.org
 
diff --git a/gnome-control-center.spec b/gnome-control-center.spec
index e57bd5d..4ab9ae9 100644
--- a/gnome-control-center.spec
+++ b/gnome-control-center.spec
@@ -125,6 +125,10 @@ Obsoletes:      fontilus
 Obsoletes:      themus
 Provides:       control-center2 = 2.22.1
 Obsoletes:      control-center2 < 2.22.1
+# gnome-control-center-branding was obsoleted with g-c-c 3.8.0 (after openSUSE 12.3)
+Obsoletes:      gnome-control-center-branding <= 12.3
+Obsoletes:      gnome-control-center-branding-openSUSE <= 12.3
+Obsoletes:      gnome-control-center-branding-upstream <= 12.3
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %glib2_gsettings_schema_requires