commit glib2-branding for openSUSE:Factory
Hello community,
here is the log from the commit of package glib2-branding for openSUSE:Factory
checked in at 2020-10-22 14:21:59
Comparing /work/SRC/openSUSE:Factory/glib2-branding (Old)
and /work/SRC/openSUSE:Factory/.glib2-branding.new.3463 (New)
Package is "glib2-branding"
Thu Oct 22 14:21:59 2020 rev:13 rq:842549 version:15
Changes:
--- /work/SRC/openSUSE:Factory/glib2-branding/glib2-branding.changes
2020-09-25 16:28:08.735710268 +0200
+++ /work/SRC/openSUSE:Factory/.glib2-branding.new.3463/glib2-branding.changes
2020-10-22 14:23:16.226803473 +0200
@@ -1,0 +2,6 @@
+Sun Oct 11 17:39:25 UTC 2020 - Callum Farmer
+
+- Add priority of 20 to gschema override, otherwise you can't
+ override it
+
+---
Other differences:
--
++ glib2-branding.spec ++
--- /var/tmp/diff_new_pack.9W6JhQ/_old 2020-10-22 14:23:17.046804210 +0200
+++ /var/tmp/diff_new_pack.9W6JhQ/_new 2020-10-22 14:23:17.050804213 +0200
@@ -98,21 +98,21 @@
%if 0%{?sle_version}
sed "s:@@IF_LEAP@@::g" | \
%endif
-grep -v ^@@IF_ > %{branding_name}-branding.gschema.override
+grep -v ^@@IF_ > 20_%{branding_name}-branding.gschema.override
%endif
%if 0%{?build_SLE}
-sed "s:@@IF_SLE@@::g" < glib2-branding.gschema.override | grep -v ^@@IF_ >
%{branding_name}-branding.gschema.override
+sed "s:@@IF_SLE@@::g" < glib2-branding.gschema.override | grep -v ^@@IF_ >
20_%{branding_name}-branding.gschema.override
%endif
%install
install -d %{buildroot}%{_sysconfdir}
install -m0644 gnome_defaults.conf %{buildroot}%{_sysconfdir}/
install -d %{buildroot}%{_datadir}/glib-2.0/schemas
-install -m0644 %{branding_name}-branding.gschema.override
%{buildroot}%{_datadir}/glib-2.0/schemas/
+install -m0644 20_%{branding_name}-branding.gschema.override
%{buildroot}%{_datadir}/glib-2.0/schemas/
%files -n gio-branding-%{branding_name}
%license COPYING
%config (noreplace) %{_sysconfdir}/gnome_defaults.conf
-%{_datadir}/glib-2.0/schemas/%{branding_name}-branding.gschema.override
+%{_datadir}/glib-2.0/schemas/20_%{branding_name}-branding.gschema.override
%changelog
commit glib2-branding for openSUSE:Factory
Hello community,
here is the log from the commit of package glib2-branding for openSUSE:Factory
checked in at 2020-09-25 16:25:08
Comparing /work/SRC/openSUSE:Factory/glib2-branding (Old)
and /work/SRC/openSUSE:Factory/.glib2-branding.new.4249 (New)
Package is "glib2-branding"
Fri Sep 25 16:25:08 2020 rev:12 rq:836042 version:15
Changes:
--- /work/SRC/openSUSE:Factory/glib2-branding/glib2-branding.changes
2020-05-26 17:14:40.555372303 +0200
+++ /work/SRC/openSUSE:Factory/.glib2-branding.new.4249/glib2-branding.changes
2020-09-25 16:28:08.735710268 +0200
@@ -1,0 +2,7 @@
+Fri Sep 18 12:36:04 UTC 2020 - Frederic Crozat
+
+- Update .gschema.override.in (jsc#SLE-14772):
+ * add different key for screenlock
+ * update background color for SLE.
+
+---
Other differences:
--
++ glib2-branding.spec ++
--- /var/tmp/diff_new_pack.6RRf7F/_old 2020-09-25 16:28:09.291710760 +0200
+++ /var/tmp/diff_new_pack.6RRf7F/_new 2020-09-25 16:28:09.295710763 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package glib2-branding
+# spec file for package glib2
#
# Copyright (c) 2020 SUSE LLC
#
@@ -91,7 +91,7 @@
%build
test -f %{_datadir}/wallpapers/%{branding_name}-default.xml
-sed
"s,@@WALLPAPER_URI@@,file://%{_datadir}/wallpapers/%{branding_name}-default.xml,"
glib2-branding.gschema.override.in > glib2-branding.gschema.override
+sed
"s,@@WALLPAPER_URI@@,file://%{_datadir}/wallpapers/%{branding_name}-default.xml,;s,@@LOCKSCREEN_URI@@,file://%{_datadir}/wallpapers/%{branding_name}-default-static-lockscreen.xml,"
glib2-branding.gschema.override.in > glib2-branding.gschema.override
#for sound theme
%if 0%{?build_openSUSE}
sed "s:@@IF_openSUSE@@::g" < glib2-branding.gschema.override | \
++ glib2-branding.gschema.override.in ++
--- /var/tmp/diff_new_pack.6RRf7F/_old 2020-09-25 16:28:09.375710834 +0200
+++ /var/tmp/diff_new_pack.6RRf7F/_new 2020-09-25 16:28:09.375710834 +0200
@@ -12,14 +12,19 @@
## Default wallpaper
picture-uri = "@@WALLPAPER_URI@@"
picture-options = "stretched"
-primary-color = "#258c06"
-secondary-color = "#258c06"
+@@IF_openSUSE@@primary-color = "#258c06"
+@@IF_openSUSE@@secondary-color = "#258c06"
+@@IF_SLE@@primary-color = "#0C322C"
+@@IF_SLE@@secondary-color = "#0C322C"
[org.gnome.desktop.screensaver]
-picture-uri = "@@WALLPAPER_URI@@"
+@@IF_openSUSE@@picture-uri = "@@WALLPAPER_URI@@"
+@@IF_SLE@@picture-uri = "@@LOCKSCREEN_URI@@"
picture-options = "stretched"
-primary-color = "#258c06"
-secondary-color = "#258c06"
+@@IF_openSUSE@@primary-color = "#258c06"
+@@IF_openSUSE@@secondary-color = "#258c06"
+@@IF_SLE@@primary-color = "#0C322C"
+@@IF_SLE@@secondary-color = "#0C322C"
@@IF_SLE@@lock-delay = 300
[org.gnome.login-screen]
commit glib2-branding for openSUSE:Factory
Hello community,
here is the log from the commit of package glib2-branding for openSUSE:Factory
checked in at 2020-05-26 17:14:19
Comparing /work/SRC/openSUSE:Factory/glib2-branding (Old)
and /work/SRC/openSUSE:Factory/.glib2-branding.new.2738 (New)
Package is "glib2-branding"
Tue May 26 17:14:19 2020 rev:11 rq:807574 version:15
Changes:
--- /work/SRC/openSUSE:Factory/glib2-branding/glib2-branding.changes
2020-03-30 22:51:08.923764691 +0200
+++ /work/SRC/openSUSE:Factory/.glib2-branding.new.2738/glib2-branding.changes
2020-05-26 17:14:40.555372303 +0200
@@ -1,0 +2,7 @@
+Mon May 18 14:12:32 UTC 2020 - Dominique Leuenberger
+
+- Only recommend wallpaper-branding-%{branding_name} when
+ gnome-shell is present. Allows gio to be installed on text-only
+ systems without pulling wallpapers in (boo#1162600).
+
+---
Other differences:
--
++ glib2-branding.spec ++
--- /var/tmp/diff_new_pack.dlnOLK/_old 2020-05-26 17:14:42.303376092 +0200
+++ /var/tmp/diff_new_pack.dlnOLK/_new 2020-05-26 17:14:42.307376101 +0200
@@ -66,7 +66,7 @@
Requires: %{gio_real_package} = %{gio_version}
Recommends: sound-theme-freedesktop
# For wallpaper
-Recommends: wallpaper-branding-%{branding_name}
+Recommends: (wallpaper-branding-%{branding_name} if gnome-shell)
Supplements:packageand(%{gio_real_package}:branding-%{branding_name})
Conflicts: gio-branding
Provides: glib2-branding-%{branding_name} = %{version}
commit glib2-branding for openSUSE:Factory
Hello community, here is the log from the commit of package glib2-branding for openSUSE:Factory checked in at 2020-03-30 22:51:04 Comparing /work/SRC/openSUSE:Factory/glib2-branding (Old) and /work/SRC/openSUSE:Factory/.glib2-branding.new.3160 (New) Package is "glib2-branding" Mon Mar 30 22:51:04 2020 rev:10 rq:789268 version:15 Changes: --- /work/SRC/openSUSE:Factory/glib2-branding/glib2-branding.changes 2020-01-24 14:20:42.738609816 +0100 +++ /work/SRC/openSUSE:Factory/.glib2-branding.new.3160/glib2-branding.changes 2020-03-30 22:51:08.923764691 +0200 @@ -1,0 +2,7 @@ +Fri Mar 13 07:11:53 UTC 2020 - QK ZHU + +- Update .gschema.override.in: + + Set sleep-inactive-ac-timeout, sleep-inactive-battery-timeout to +0 for Leap to be consistent with SLE and old versions (bsc#1158497). + +--- Other differences: -- ++ glib2-branding.gschema.override.in ++ --- /var/tmp/diff_new_pack.YmTXE3/_old 2020-03-30 22:51:10.911765775 +0200 +++ /var/tmp/diff_new_pack.YmTXE3/_new 2020-03-30 22:51:10.947765794 +0200 @@ -54,10 +54,12 @@ ignore-paths = ['/boot/efi'] [org.gnome.settings-daemon.plugins.power] -@@IF_SLE@@## Energy Star compliant configuration is disabled for SLE from vendor level -@@IF_SLE@@## The recommended way to enable this is via GNOME Control Center, dconf-editor or gsettings +## Energy Star compliant configuration is disabled for SLE and Leap from vendor level +## The recommended way to enable this is via GNOME Control Center, dconf-editor or gsettings @@IF_SLE@@sleep-inactive-ac-timeout = 0 @@IF_SLE@@sleep-inactive-battery-timeout = 0 +@@IF_LEAP@@sleep-inactive-ac-timeout = 0 +@@IF_LEAP@@sleep-inactive-battery-timeout = 0 [org.gnome.settings-daemon.plugins.xsettings] ## the PackageKit gtk+ module is too spammy, fdo#23917
commit glib2-branding for openSUSE:Factory
Hello community, here is the log from the commit of package glib2-branding for openSUSE:Factory checked in at 2020-01-24 14:20:42 Comparing /work/SRC/openSUSE:Factory/glib2-branding (Old) and /work/SRC/openSUSE:Factory/.glib2-branding.new.26092 (New) Package is "glib2-branding" Fri Jan 24 14:20:42 2020 rev:9 rq:766123 version:15 Changes: --- /work/SRC/openSUSE:Factory/glib2-branding/glib2-branding.changes 2019-11-03 11:51:55.522950230 +0100 +++ /work/SRC/openSUSE:Factory/.glib2-branding.new.26092/glib2-branding.changes 2020-01-24 14:20:42.738609816 +0100 @@ -1,0 +2,8 @@ +Tue Jan 7 08:53:34 UTC 2020 - QK ZHU + +- Update .gschema.override.in: + + Delete unused settings-daemon.plugins.power keys. + + Set sleep-inactive-ac-timeout, sleep-inactive-battery-timeout to +0 for SLE to be consistent with old versions (bsc#1158497). + +--- Other differences: -- ++ glib2-branding.spec ++ --- /var/tmp/diff_new_pack.Z2tRq3/_old 2020-01-24 14:20:43.442610063 +0100 +++ /var/tmp/diff_new_pack.Z2tRq3/_new 2020-01-24 14:20:43.446610064 +0100 @@ -1,7 +1,7 @@ # # spec file for package glib2-branding # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed ++ glib2-branding.gschema.override.in ++ --- /var/tmp/diff_new_pack.Z2tRq3/_old 2020-01-24 14:20:43.498610083 +0100 +++ /var/tmp/diff_new_pack.Z2tRq3/_new 2020-01-24 14:20:43.502610085 +0100 @@ -54,14 +54,10 @@ ignore-paths = ['/boot/efi'] [org.gnome.settings-daemon.plugins.power] -## Enable Energy Star compliant default configuration -sleep-inactive-battery-type = "suspend" -## To complete Energy Star compliant default configuration, you should enable this too: -## (disabled by default because suspending is not working fine in all cases) -# sleep-inactive-ac = true -# sleep-inactive-ac-timeout = 1200 -# sleep-inactive-battery = true -# sleep-inactive-battery-timeout = 1200 +@@IF_SLE@@## Energy Star compliant configuration is disabled for SLE from vendor level +@@IF_SLE@@## The recommended way to enable this is via GNOME Control Center, dconf-editor or gsettings +@@IF_SLE@@sleep-inactive-ac-timeout = 0 +@@IF_SLE@@sleep-inactive-battery-timeout = 0 [org.gnome.settings-daemon.plugins.xsettings] ## the PackageKit gtk+ module is too spammy, fdo#23917
commit glib2-branding for openSUSE:Factory
Hello community, here is the log from the commit of package glib2-branding for openSUSE:Factory checked in at 2019-11-03 11:51:54 Comparing /work/SRC/openSUSE:Factory/glib2-branding (Old) and /work/SRC/openSUSE:Factory/.glib2-branding.new.2990 (New) Package is "glib2-branding" Sun Nov 3 11:51:54 2019 rev:8 rq:744267 version:15 Changes: --- /work/SRC/openSUSE:Factory/glib2-branding/glib2-branding.changes 2019-10-30 14:40:23.117707832 +0100 +++ /work/SRC/openSUSE:Factory/.glib2-branding.new.2990/glib2-branding.changes 2019-11-03 11:51:55.522950230 +0100 @@ -1,0 +2,5 @@ +Tue Oct 29 15:31:01 UTC 2019 - Michael Gorse + +- Add super+f1 key binding for help to match GNOME default. + +--- Other differences: -- ++ glib2-branding.gschema.override.in ++ --- /var/tmp/diff_new_pack.D56hM8/_old 2019-11-03 11:51:56.082950932 +0100 +++ /var/tmp/diff_new_pack.D56hM8/_new 2019-11-03 11:51:56.082950932 +0100 @@ -68,7 +68,7 @@ disabled-gtk-modules = [ "pk-gtk-module" ] [org.gnome.settings-daemon.plugins.media-keys] -help = ['Help'] +help = ['Help', 'F1'] [org.gnome.shell] ## Default apps shown in the gnome-shell dash
commit glib2-branding for openSUSE:Factory
Hello community, here is the log from the commit of package glib2-branding for openSUSE:Factory checked in at 2019-10-30 14:40:21 Comparing /work/SRC/openSUSE:Factory/glib2-branding (Old) and /work/SRC/openSUSE:Factory/.glib2-branding.new.2990 (New) Package is "glib2-branding" Wed Oct 30 14:40:21 2019 rev:7 rq:743765 version:15 Changes: --- /work/SRC/openSUSE:Factory/glib2-branding/glib2-branding.changes 2018-11-13 16:27:53.382452757 +0100 +++ /work/SRC/openSUSE:Factory/.glib2-branding.new.2990/glib2-branding.changes 2019-10-30 14:40:23.117707832 +0100 @@ -1,0 +2,6 @@ +Mon Oct 28 07:40:04 UTC 2019 - Dominique Leuenberger + +- Fix keyassignment for help: the schema was changed to array of + strings, as multiple keys can now be bound. + +--- Other differences: -- ++ glib2-branding.spec ++ --- /var/tmp/diff_new_pack.2OO30e/_old 2019-10-30 14:40:23.629708377 +0100 +++ /var/tmp/diff_new_pack.2OO30e/_new 2019-10-30 14:40:23.633708382 +0100 @@ -1,7 +1,7 @@ # # spec file for package glib2-branding # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 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 ++ glib2-branding.gschema.override.in ++ --- /var/tmp/diff_new_pack.2OO30e/_old 2019-10-30 14:40:23.697708450 +0100 +++ /var/tmp/diff_new_pack.2OO30e/_new 2019-10-30 14:40:23.697708450 +0100 @@ -68,7 +68,7 @@ disabled-gtk-modules = [ "pk-gtk-module" ] [org.gnome.settings-daemon.plugins.media-keys] -help = "Help" +help = ['Help'] [org.gnome.shell] ## Default apps shown in the gnome-shell dash
commit glib2-branding for openSUSE:Factory
Hello community,
here is the log from the commit of package glib2-branding for openSUSE:Factory
checked in at 2018-11-13 16:27:34
Comparing /work/SRC/openSUSE:Factory/glib2-branding (Old)
and /work/SRC/openSUSE:Factory/.glib2-branding.new (New)
Package is "glib2-branding"
Tue Nov 13 16:27:34 2018 rev:6 rq:647326 version:15
Changes:
--- /work/SRC/openSUSE:Factory/glib2-branding/glib2-branding.changes
2018-07-01 21:25:50.176812198 +0200
+++ /work/SRC/openSUSE:Factory/.glib2-branding.new/glib2-branding.changes
2018-11-13 16:27:53.382452757 +0100
@@ -1,0 +2,6 @@
+Wed Nov 7 18:15:56 UTC 2018 - Dominique Leuenberger
+
+- Update gnome_defaults: evince.desktop has been renamed to
+ org.gnome.Evince.desktop with GNOME 3.30.
+
+---
Other differences:
--
++ glib2-branding.spec ++
--- /var/tmp/diff_new_pack.pC9F16/_old 2018-11-13 16:27:54.994450214 +0100
+++ /var/tmp/diff_new_pack.pC9F16/_new 2018-11-13 16:27:54.998450208 +0100
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@@ -64,6 +64,7 @@
Summary:%{branding_name} definitions of default settings and
applications
Group: System/GUI/GNOME
Requires: %{gio_real_package} = %{gio_version}
+Recommends: sound-theme-freedesktop
# For wallpaper
Recommends: wallpaper-branding-%{branding_name}
Supplements:packageand(%{gio_real_package}:branding-%{branding_name})
@@ -72,7 +73,6 @@
Obsoletes: glib2-branding-%{branding_name} < %{version}
Provides: gio-branding = %{gio_version}
%glib2_gsettings_schema_requires
-Recommends: sound-theme-freedesktop
%if 0%{?build_SLE}
# Obsolete SLE11 packages to resolve file conflicts on sle11->sle12 upgrade
Obsoletes: glib2-branding-SLED
++ glib2-branding-gnome_defaults.conf ++
--- /var/tmp/diff_new_pack.pC9F16/_old 2018-11-13 16:27:55.042450139 +0100
+++ /var/tmp/diff_new_pack.pC9F16/_new 2018-11-13 16:27:55.042450139 +0100
@@ -71,7 +71,7 @@
# Nice GNOME default applications
eog.desktop
-evince.desktop
+org.gnome.Evince.desktop
org.gnome.gedit.desktop
file-roller.desktop
# file-roller supports iso, but most people will prefer brasero:
commit glib2-branding for openSUSE:Factory
Hello community,
here is the log from the commit of package glib2-branding for openSUSE:Factory
checked in at 2018-07-01 21:25:48
Comparing /work/SRC/openSUSE:Factory/glib2-branding (Old)
and /work/SRC/openSUSE:Factory/.glib2-branding.new (New)
Package is "glib2-branding"
Sun Jul 1 21:25:48 2018 rev:5 rq:619720 version:15
Changes:
--- /work/SRC/openSUSE:Factory/glib2-branding/glib2-branding.changes
2018-05-06 15:00:31.335109712 +0200
+++ /work/SRC/openSUSE:Factory/.glib2-branding.new/glib2-branding.changes
2018-07-01 21:25:50.176812198 +0200
@@ -1,0 +2,6 @@
+Fri Jun 29 01:56:41 UTC 2018 - qk...@suse.com
+
+- Recommend sound-theme-freedesktop by both openSUSE and SLE.
+ (bsc#1097595)
+
+---
Other differences:
--
++ glib2-branding.spec ++
--- /var/tmp/diff_new_pack.1vBiiR/_old 2018-07-01 21:25:50.616811625 +0200
+++ /var/tmp/diff_new_pack.1vBiiR/_new 2018-07-01 21:25:50.620811620 +0200
@@ -72,9 +72,7 @@
Obsoletes: glib2-branding-%{branding_name} < %{version}
Provides: gio-branding = %{gio_version}
%glib2_gsettings_schema_requires
-%if 0%{?build_openSUSE}
Recommends: sound-theme-freedesktop
-%endif
%if 0%{?build_SLE}
# Obsolete SLE11 packages to resolve file conflicts on sle11->sle12 upgrade
Obsoletes: glib2-branding-SLED
commit glib2-branding for openSUSE:Factory
Hello community,
here is the log from the commit of package glib2-branding for openSUSE:Factory
checked in at 2018-05-06 15:00:30
Comparing /work/SRC/openSUSE:Factory/glib2-branding (Old)
and /work/SRC/openSUSE:Factory/.glib2-branding.new (New)
Package is "glib2-branding"
Sun May 6 15:00:30 2018 rev:4 rq:603689 version:15
Changes:
--- /work/SRC/openSUSE:Factory/glib2-branding/glib2-branding.changes
2018-03-14 19:25:37.449784510 +0100
+++ /work/SRC/openSUSE:Factory/.glib2-branding.new/glib2-branding.changes
2018-05-06 15:00:31.335109712 +0200
@@ -1,0 +2,8 @@
+Thu May 3 02:48:12 UTC 2018 - yfji...@suse.com
+
+- Update .gschema.override.in: referring the implementation of
+ bsc#1077332, fully enable gnome-software notification which is
+ now used on both leap15 and sle15 to replace the legacy g-s-d
+ notification method (boo#1090042).
+
+---
Other differences:
--
++ glib2-branding.gschema.override.in ++
--- /var/tmp/diff_new_pack.jSklAX/_old 2018-05-06 15:00:32.147079912 +0200
+++ /var/tmp/diff_new_pack.jSklAX/_new 2018-05-06 15:00:32.147079912 +0200
@@ -91,10 +91,10 @@
## bgo#746592 bsc#1070090
overrides = {'Gtk/ShellShowsAppMenu': <0>}
-@@IF_LEAP@@[org.gnome.software]
-@@IF_LEAP@@# Disable GNOME Software's automatic update notifications -
openSUSE relies on
-@@IF_LEAP@@# gnome-settings-daemon's internal update plugin for update
notifications.
-@@IF_LEAP@@download-updates = false
+# @@IF_LEAP@@[org.gnome.software]
+# @@IF_LEAP@@# Disable GNOME Software's automatic update notifications -
openSUSE relies on
+# @@IF_LEAP@@# gnome-settings-daemon's internal update plugin for update
notifications.
+# @@IF_LEAP@@download-updates = false
@@IF_LEAP@@[org.gnome.nautilus.icon-view]
@@IF_LEAP@@default-zoom-level = 'small'
commit glib2-branding for openSUSE:Factory
Hello community,
here is the log from the commit of package glib2-branding for openSUSE:Factory
checked in at 2018-03-14 19:25:34
Comparing /work/SRC/openSUSE:Factory/glib2-branding (Old)
and /work/SRC/openSUSE:Factory/.glib2-branding.new (New)
Package is "glib2-branding"
Wed Mar 14 19:25:34 2018 rev:3 rq:584819 version:15
Changes:
--- /work/SRC/openSUSE:Factory/glib2-branding/glib2-branding.changes
2017-12-20 10:41:00.146045314 +0100
+++ /work/SRC/openSUSE:Factory/.glib2-branding.new/glib2-branding.changes
2018-03-14 19:25:37.449784510 +0100
@@ -1,0 +2,11 @@
+Wed Feb 28 16:26:42 UTC 2018 - dims...@opensuse.org
+
+- Modernize spec-file by calling spec-cleaner
+
+---
+Fri Dec 22 08:20:44 UTC 2017 - dims...@opensuse.org
+
+- Update .gschema.override.in: evolution.desktop has been renamed
+ to org.gnome.Evolution.desktop (for GNOME 3.28).
+
+---
Other differences:
--
++ glib2-branding.spec ++
--- /var/tmp/diff_new_pack.1u8X3u/_old 2018-03-14 19:25:38.473748153 +0100
+++ /var/tmp/diff_new_pack.1u8X3u/_new 2018-03-14 19:25:38.477748011 +0100
@@ -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}
%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 @@
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 @@
# 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 -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
++ glib2-branding.gschema.override.in ++
--- /var/tmp/diff_new_pack.1u8X3u/_old 2018-03-14 19:25:38.581744318 +0100
+++ /var/tmp/diff_new_pack.1u8X3u/_new 2018-03-14 19:25:38.585744176 +0100
@@ -72,7 +72,7 @@
[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-m...@gnome-shell-extensions.gcampax.github.com' ]
commit glib2-branding for openSUSE:Factory
Hello community,
here is the log from the commit of package glib2-branding for openSUSE:Factory
checked in at 2017-12-20 10:40:55
Comparing /work/SRC/openSUSE:Factory/glib2-branding (Old)
and /work/SRC/openSUSE:Factory/.glib2-branding.new (New)
Package is "glib2-branding"
Wed Dec 20 10:40:55 2017 rev:2 rq:558723 version:15
Changes:
--- /work/SRC/openSUSE:Factory/glib2-branding/glib2-branding.changes
2017-12-19 10:49:52.518295137 +0100
+++ /work/SRC/openSUSE:Factory/.glib2-branding.new/glib2-branding.changes
2017-12-20 10:41:00.146045314 +0100
@@ -1,0 +2,13 @@
+Wed Dec 20 07:48:17 UTC 2017 - dims...@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 - dims...@opensuse.org
+
+- Use variable flavor instead of BUILD_FLAVOR: obs is only
+ replacing the first occurence.
+
+---
Other differences:
--
++ glib2-branding.spec ++
--- /var/tmp/diff_new_pack.nNuK9R/_old 2017-12-20 10:41:00.937988103 +0100
+++ /var/tmp/diff_new_pack.nNuK9R/_new 2017-12-20 10:41:00.941987814 +0100
@@ -24,7 +24,7 @@
%else
%define branding_name %{flavor}
%define dash -
-%if "@BUILD_FLAVOR@" == "SLE"
+%if "%{flavor}" == "SLE"
%define build_SLE 1
%else
%define build_openSUSE 1
++ glib2-branding.gschema.override.in ++
--- /var/tmp/diff_new_pack.nNuK9R/_old 2017-12-20 10:41:01.009982902 +0100
+++ /var/tmp/diff_new_pack.nNuK9R/_new 2017-12-20 10:41:01.013982613 +0100
@@ -72,8 +72,8 @@
[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-m...@gnome-shell-extensions.gcampax.github.com' ]
