pool/gnome-control-center
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 163702 from GNOME:Factory

Browse Source 
Add the g-c-c branding obsoletes to GF as well - Seems to work in G:S after all (forwarded request 163604 from Zaitor)

OBS-URL: https://build.opensuse.org/request/show/163702
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-control-center?expand=0&rev=92
This commit is contained in:
Stephan Kulow 2013-04-17 15:40:22 +00:00 committed by Git OBS Bridge
commit 8899258f36
3 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
g-c-c-online-accounts.patch
View File

@ -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;

10
gnome-control-center.changes
View File

@ -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

4
gnome-control-center.spec
View File

@ -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