pool/glib2-branding
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 584819 from GNOME:Factory

Browse Source 
GNOME 3.28

OBS-URL: https://build.opensuse.org/request/show/584819
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/glib2-branding?expand=0&rev=3
This commit is contained in:
Dominique Leuenberger 2018-03-14 18:25:34 +00:00 committed by Git OBS Bridge
commit e29599214b
3 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
glib2-branding.changes
View File

@ -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 Wed Dec 20 07:48:17 UTC 2017 - dimstar@opensuse.org

2
glib2-branding.gschema.override.in
View File

@ -72,7 +72,7 @@ help = "Help"
[org.gnome.shell] [org.gnome.shell]
## Default apps shown in the gnome-shell dash ## 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@@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@@## Default extensions that are enabled
@@IF_SLE@@enabled-extensions = [ 'alternative-status-menu@gnome-shell-extensions.gcampax.github.com' ] @@IF_SLE@@enabled-extensions = [ 'alternative-status-menu@gnome-shell-extensions.gcampax.github.com' ]

19
glib2-branding.spec
View File

@ -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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -17,10 +17,9 @@
%define flavor @BUILD_FLAVOR@ %define flavor @BUILD_FLAVOR@
%if "%{flavor}" == "" %if "%{flavor}" == ""
%define branding_name %nil %define branding_name %{nil}
ExclusiveArch: %nil ExclusiveArch: %{nil}
%else %else
%define branding_name %{flavor} %define branding_name %{flavor}
%define dash - %define dash -
@ -34,15 +33,13 @@ ExclusiveArch: %nil
ExclusiveArch: %{nil} ExclusiveArch: %{nil}
%endif %endif
%endif %endif
%define gio_real_package %(rpm -q --qf '%%{name}' --whatprovides gio) %define gio_real_package %(rpm -q --qf '%%{name}' --whatprovides gio)
%define gio_version %(rpm -q --qf '%%{version}' %{gio_real_package}) %define gio_version %(rpm -q --qf '%%{version}' %{gio_real_package})
Name: glib2-branding%{?dash}%{branding_name} Name: glib2-branding%{?dash}%{branding_name}
Summary: General-Purpose Utility Library -- %{branding_name} default configuration Summary: General-Purpose Utility Library -- %{branding_name} default configuration
License: BSD-3-Clause License: BSD-3-Clause
Group: System/GUI/GNOME Group: System/GUI/GNOME
Url: http://www.gtk.org/ URL: http://www.gtk.org/
Source: glib2-branding-gnome_defaults.conf Source: glib2-branding-gnome_defaults.conf
Source1: glib2-branding-COPYING Source1: glib2-branding-COPYING
Source2: glib2-branding.gschema.override.in Source2: glib2-branding.gschema.override.in
@ -50,7 +47,6 @@ Source2: glib2-branding.gschema.override.in
BuildRequires: glib2-branding-upstream BuildRequires: glib2-branding-upstream
BuildRequires: glib2-devel BuildRequires: glib2-devel
BuildRequires: wallpaper-branding-%{branding_name} BuildRequires: wallpaper-branding-%{branding_name}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch BuildArch: noarch
%if 0%{?build_openSUSE} %if 0%{?build_openSUSE}
Version: 42.1 Version: 42.1
@ -71,7 +67,7 @@ Requires: %{gio_real_package} = %{gio_version}
# For wallpaper # For wallpaper
Recommends: wallpaper-branding-%{branding_name} Recommends: wallpaper-branding-%{branding_name}
Supplements: packageand(%{gio_real_package}:branding-%{branding_name}) Supplements: packageand(%{gio_real_package}:branding-%{branding_name})
Conflicts: otherproviders(gio-branding) Conflicts: gio-branding
Provides: glib2-branding-%{branding_name} = %{version} Provides: glib2-branding-%{branding_name} = %{version}
Obsoletes: glib2-branding-%{branding_name} < %{version} Obsoletes: glib2-branding-%{branding_name} < %{version}
Provides: gio-branding = %{gio_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/ install -m0644 %{branding_name}-branding.gschema.override %{buildroot}%{_datadir}/glib-2.0/schemas/
%files -n gio-branding-%{branding_name} %files -n gio-branding-%{branding_name}
%defattr (-, root, root) %license COPYING
%doc COPYING
%config (noreplace) %{_sysconfdir}/gnome_defaults.conf %config (noreplace) %{_sysconfdir}/gnome_defaults.conf
%{_datadir}/glib-2.0/schemas/%{branding_name}-branding.gschema.override %{_datadir}/glib-2.0/schemas/%{branding_name}-branding.gschema.override