From 68e36c2821488495a968f8f0bc533d7d8fe471489ce577a79c601ed0902e71b5 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Mon, 5 Mar 2018 13:47:41 +0000
Subject: [PATCH] Accepting request 581061 from GNOME:Next

spec-cleaner

OBS-URL: https://build.opensuse.org/request/show/581061
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/glib2-branding?expand=0&rev=6
---
 glib2-branding.changes             | 11 +++++++++++
 glib2-branding.gschema.override.in |  2 +-
 glib2-branding.spec                | 19 +++++++------------
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/glib2-branding.changes b/glib2-branding.changes
index 1420cd5..aebf58d 100644
--- a/glib2-branding.changes
+++ b/glib2-branding.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Wed Feb 28 16:26:42 UTC 2018 - dimstar@opensuse.org
+
+- Modernize spec-file by calling spec-cleaner
+
+-------------------------------------------------------------------
+Fri Dec 22 08:20:44 UTC 2017 - dimstar@opensuse.org
+
+- Update .gschema.override.in: evolution.desktop has been renamed
+  to org.gnome.Evolution.desktop (for GNOME 3.28).
+
 -------------------------------------------------------------------
 Wed Dec 20 07:48:17 UTC 2017 - dimstar@opensuse.org
 
diff --git a/glib2-branding.gschema.override.in b/glib2-branding.gschema.override.in
index 2c9b088..acf2c45 100644
--- a/glib2-branding.gschema.override.in
+++ b/glib2-branding.gschema.override.in
@@ -72,7 +72,7 @@ help = "Help"
 
 [org.gnome.shell]
 ## Default apps shown in the gnome-shell dash
-@@IF_openSUSE@@favorite-apps = [ 'firefox.desktop', 'evolution.desktop', 'empathy.desktop', 'gnome-music.desktop', 'shotwell.desktop', 'writer.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Documents.desktop' ]
+@@IF_openSUSE@@favorite-apps = [ 'firefox.desktop', 'org.gnome.Evolution.desktop', 'empathy.desktop', 'gnome-music.desktop', 'shotwell.desktop', 'writer.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Documents.desktop' ]
 @@IF_SLE@@favorite-apps = [ 'firefox.desktop', 'evolution.desktop', 'pidgin.desktop', 'gnome-photos.desktop', 'startcenter.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Documents.desktop', 'yelp.desktop' ]
 @@IF_SLE@@## Default extensions that are enabled
 @@IF_SLE@@enabled-extensions = [ 'alternative-status-menu@gnome-shell-extensions.gcampax.github.com' ]
diff --git a/glib2-branding.spec b/glib2-branding.spec
index ae8ffdc..25f7b7f 100644
--- a/glib2-branding.spec
+++ b/glib2-branding.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package glib2
+# spec file for package glib2-branding
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,10 +17,9 @@
 
 
 %define flavor @BUILD_FLAVOR@
-
 %if "%{flavor}" == ""
-%define branding_name %nil
-ExclusiveArch:  %nil
+%define branding_name %{nil}
+ExclusiveArch:  %{nil}
 %else
 %define branding_name %{flavor}
 %define dash -
@@ -34,15 +33,13 @@ ExclusiveArch:  %nil
 ExclusiveArch:  %{nil}
 %endif
 %endif
-
 %define gio_real_package %(rpm -q --qf '%%{name}' --whatprovides gio)
 %define gio_version %(rpm -q --qf '%%{version}' %{gio_real_package})
-
 Name:           glib2-branding%{?dash}%{branding_name}
 Summary:        General-Purpose Utility Library -- %{branding_name} default configuration
 License:        BSD-3-Clause
 Group:          System/GUI/GNOME
-Url:            http://www.gtk.org/
+URL:            http://www.gtk.org/
 Source:         glib2-branding-gnome_defaults.conf
 Source1:        glib2-branding-COPYING
 Source2:        glib2-branding.gschema.override.in
@@ -50,7 +47,6 @@ Source2:        glib2-branding.gschema.override.in
 BuildRequires:  glib2-branding-upstream
 BuildRequires:  glib2-devel
 BuildRequires:  wallpaper-branding-%{branding_name}
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 %if 0%{?build_openSUSE}
 Version:        42.1
@@ -71,7 +67,7 @@ Requires:       %{gio_real_package} = %{gio_version}
 # For wallpaper
 Recommends:     wallpaper-branding-%{branding_name}
 Supplements:    packageand(%{gio_real_package}:branding-%{branding_name})
-Conflicts:      otherproviders(gio-branding)
+Conflicts:      gio-branding
 Provides:       glib2-branding-%{branding_name} = %{version}
 Obsoletes:      glib2-branding-%{branding_name} < %{version}
 Provides:       gio-branding = %{gio_version}
@@ -117,8 +113,7 @@ install -d %{buildroot}%{_datadir}/glib-2.0/schemas
 install -m0644 %{branding_name}-branding.gschema.override %{buildroot}%{_datadir}/glib-2.0/schemas/
 
 %files -n gio-branding-%{branding_name}
-%defattr (-, root, root)
-%doc COPYING
+%license COPYING
 %config (noreplace) %{_sysconfdir}/gnome_defaults.conf
 %{_datadir}/glib-2.0/schemas/%{branding_name}-branding.gschema.override