From 8ec7051e6cbeb5ff12dce452b3d8c7a109e48c9aa01d88b3ce4b93871261daf5 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 19 Dec 2017 12:58:40 +0000 Subject: [PATCH 1/2] Accepting request 558524 from GNOME:Next - Use variable flavor instead of BUILD_FLAVOR: obs is only replacing the first occurence. OBS-URL: https://build.opensuse.org/request/show/558524 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/glib2-branding?expand=0&rev=3 --- glib2-branding.changes | 6 ++++++ glib2-branding.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/glib2-branding.changes b/glib2-branding.changes index e179ff9..0fdd995 100644 --- a/glib2-branding.changes +++ b/glib2-branding.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Dec 19 12:49:42 UTC 2017 - dimstar@opensuse.org + +- Use variable flavor instead of BUILD_FLAVOR: obs is only + replacing the first occurence. + ------------------------------------------------------------------- Fri Dec 15 12:21:18 UTC 2017 - dimstar@opensuse.org diff --git a/glib2-branding.spec b/glib2-branding.spec index 5aa5823..ae8ffdc 100644 --- a/glib2-branding.spec +++ b/glib2-branding.spec @@ -24,7 +24,7 @@ ExclusiveArch: %nil %else %define branding_name %{flavor} %define dash - -%if "@BUILD_FLAVOR@" == "SLE" +%if "%{flavor}" == "SLE" %define build_SLE 1 %else %define build_openSUSE 1 From 2c39649dd22411fd4cef010ac658322cc0727438e35e32e513930c091620fe70 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 20 Dec 2017 07:49:23 +0000 Subject: [PATCH 2/2] - Revert "Update .gschema.override.in: evolution.desktop has been renamed to org.gnome.Evolution.desktop.": This will only be valid with GNOME 3.28. OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/glib2-branding?expand=0&rev=4 --- glib2-branding.changes | 7 +++++++ glib2-branding.gschema.override.in | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/glib2-branding.changes b/glib2-branding.changes index 0fdd995..1420cd5 100644 --- a/glib2-branding.changes +++ b/glib2-branding.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Dec 20 07:48:17 UTC 2017 - dimstar@opensuse.org + +- Revert "Update .gschema.override.in: evolution.desktop has been + renamed to org.gnome.Evolution.desktop.": This will only be valid + with GNOME 3.28. + ------------------------------------------------------------------- Tue Dec 19 12:49:42 UTC 2017 - dimstar@opensuse.org diff --git a/glib2-branding.gschema.override.in b/glib2-branding.gschema.override.in index 1d2530f..2c9b088 100644 --- a/glib2-branding.gschema.override.in +++ b/glib2-branding.gschema.override.in @@ -72,8 +72,8 @@ help = "Help" [org.gnome.shell] ## Default apps shown in the gnome-shell dash -@@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', 'org.gnome.Evolution.desktop', 'pidgin.desktop', 'gnome-photos.desktop', 'startcenter.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Documents.desktop', 'yelp.desktop' ] +@@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_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' ]