diff --git a/.gitignore b/.gitignore index f077160..73213a0 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/gsettings-desktop-schemas-3.24.1.tar.xz +SOURCES/gsettings-desktop-schemas-3.28.0.tar.xz diff --git a/.gsettings-desktop-schemas.metadata b/.gsettings-desktop-schemas.metadata index 47e682c..585c7ab 100644 --- a/.gsettings-desktop-schemas.metadata +++ b/.gsettings-desktop-schemas.metadata @@ -1 +1 @@ -97b1d61f74fe6d46a50644acf245722d03519e2f SOURCES/gsettings-desktop-schemas-3.24.1.tar.xz +1076225bda5d32e1111cbf7da1f5958abd928b11 SOURCES/gsettings-desktop-schemas-3.28.0.tar.xz diff --git a/SOURCES/0001-schemas-Add-tertiary-button-action-for-Wacom-styli.patch b/SOURCES/0001-schemas-Add-tertiary-button-action-for-Wacom-styli.patch deleted file mode 100644 index 42d7fa8..0000000 --- a/SOURCES/0001-schemas-Add-tertiary-button-action-for-Wacom-styli.patch +++ /dev/null @@ -1,29 +0,0 @@ -From b2b911433943ed31e7455347451a12d1a3bc137a Mon Sep 17 00:00:00 2001 -From: Jason Gerecke -Date: Mon, 9 Oct 2017 14:43:45 -0700 -Subject: [PATCH] schemas: Add tertiary-button-action for Wacom styli - -https://bugzilla.gnome.org/show_bug.cgi?id=790028 ---- - schemas/org.gnome.desktop.peripherals.gschema.xml.in | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/schemas/org.gnome.desktop.peripherals.gschema.xml.in b/schemas/org.gnome.desktop.peripherals.gschema.xml.in -index 54d29d9..0f96982 100644 ---- a/schemas/org.gnome.desktop.peripherals.gschema.xml.in -+++ b/schemas/org.gnome.desktop.peripherals.gschema.xml.in -@@ -149,6 +149,11 @@ - Secondary button action - Secondary stylus button action, this button is located along the pen handle on some styli like the Grip Pen. Other styli like the Airbrush Pen or the Inking Pen only have one button, this setting is ineffective on those. - -+ -+ 'default' -+ Tertiary button action -+ Tertiary stylus button action, this button is located along the pen handle on some styli like the 3D Pen. Other styli like the Grip Pen only have two buttons, this setting is ineffective on those. -+ - - - --- -2.17.0 - diff --git a/SOURCES/0001-schemas-default-lock-background.patch b/SOURCES/0001-schemas-default-lock-background.patch new file mode 100644 index 0000000..23f4d0b --- /dev/null +++ b/SOURCES/0001-schemas-default-lock-background.patch @@ -0,0 +1,28 @@ +From ff14d233b2117fc1b18955c62df29bb687b0f8ff Mon Sep 17 00:00:00 2001 +From: Jakub Steiner +Date: Mon, 26 Mar 2018 15:45:46 +0200 +Subject: [PATCH] schemas: default lock background + +We no longer ship explicit default lock screen background. + +https://bugzilla.gnome.org/show_bug.cgi?id=794698 +--- + schemas/org.gnome.desktop.screensaver.gschema.xml.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/schemas/org.gnome.desktop.screensaver.gschema.xml.in b/schemas/org.gnome.desktop.screensaver.gschema.xml.in +index 9eacd74a32..5c2db2a156 100644 +--- a/schemas/org.gnome.desktop.screensaver.gschema.xml.in ++++ b/schemas/org.gnome.desktop.screensaver.gschema.xml.in +@@ -95,7 +95,7 @@ + + + +- 'file://@datadir@/backgrounds/gnome/adwaita-lock.jpg' ++ 'file://@datadir@/backgrounds/gnome/adwaita-timed.xml' + Picture URI + + URI to use for the background image. Note that the backend only supports +-- +2.17.1 + diff --git a/SPECS/gsettings-desktop-schemas.spec b/SPECS/gsettings-desktop-schemas.spec index b9a5353..591c0b7 100644 --- a/SPECS/gsettings-desktop-schemas.spec +++ b/SPECS/gsettings-desktop-schemas.spec @@ -1,17 +1,16 @@ %global debug_package %{nil} Name: gsettings-desktop-schemas -Version: 3.24.1 +Version: 3.28.0 Release: 2%{?dist} Summary: A collection of GSettings schemas License: LGPLv2+ # no homepage exists for this component URL: http://bugzilla.gnome.org/enter_bug.cgi?product=gsettings-desktop-schemas -#VCS: git:git://git.gnome.org/gsettings-desktop-schemas -Source0: http://download.gnome.org/sources/%{name}/3.24/%{name}-%{version}.tar.xz - -Patch0: 0001-schemas-Add-tertiary-button-action-for-Wacom-styli.patch +Source0: http://download.gnome.org/sources/%{name}/3.28/%{name}-%{version}.tar.xz +# Backported from upstream +Patch0: 0001-schemas-default-lock-background.patch BuildRequires: glib2-devel >= 2.31.0 BuildRequires: intltool @@ -38,8 +37,8 @@ and header files for developing applications that use %{name}. %prep -%setup -q -%patch0 -p1 +%autosetup -p1 + %build %configure --disable-schemas-compile --enable-introspection=yes @@ -76,9 +75,17 @@ fi %changelog +* Tue Sep 04 2018 Kalev Lember - 3.28.0-2 +- Fix lock screen background to show up +- Resolves: #1597764 + +* Thu Apr 26 2018 Kalev Lember - 3.28.0-1 +- Update to 3.28.0 +- Resolves: #1569273 + * Tue Apr 17 2018 Carlos Garnacho - 3.24.1-2 - Add support for Wacom Pro Pen 3D styli -Resolves: #1568715 +Resolves: #1564064 * Wed Sep 20 2017 Bastien Nocera - 3.24.1-1 + gsettings-desktop-schemas-3.24.1-1