Accepting request 558723 from GNOME:Factory

- Revert "Update .gschema.override.in: evolution.desktop has been
  renamed to org.gnome.Evolution.desktop.": This will only be valid
  with GNOME 3.28.

- Use variable flavor instead of BUILD_FLAVOR: obs is only
  replacing the first occurence.

OBS-URL: https://build.opensuse.org/request/show/558723
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/glib2-branding?expand=0&rev=2
This commit is contained in:
Dominique Leuenberger 2017-12-20 09:40:55 +00:00 committed by Git OBS Bridge
commit 87430de0d8
3 changed files with 16 additions and 3 deletions

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
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
- 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

View File

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

View File

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