Update to 42.0

.gitignore

@@ -67,3 +67,4 @@ gnome-backgrounds-2.30.0.tar.bz2
 /gnome-backgrounds-40.1.tar.xz
 /gnome-backgrounds-41.0.tar.xz
 /gnome-backgrounds-42.beta.tar.xz
+/gnome-backgrounds-42.0.tar.xz

gnome-backgrounds-42.beta-split-xml.patch

@@ -1,348 +0,0 @@
-From 45bc7738014449733398215a92c2ff6351d860eb Mon Sep 17 00:00:00 2001
-From: Jakub Steiner <jimmac@gmail.com>
-Date: Thu, 10 Mar 2022 13:36:52 +0100
-Subject: [PATCH] split xml
-
-Fixes https://gitlab.gnome.org/GNOME/gnome-backgrounds/-/issues/24
----
- backgrounds/blobs.xml.in             | 13 ++++
- backgrounds/brush-strokes.xml.in     | 13 ++++
- backgrounds/disco.xml.in             | 13 ++++
- backgrounds/drool.xml.in             | 13 ++++
- backgrounds/gnome-backgrounds.xml.in | 93 ----------------------------
- backgrounds/libadwaita.xml.in        | 13 ++++
- backgrounds/meson.build              | 13 +++-
- backgrounds/pixels.xml.in            | 13 ++++
- backgrounds/symbolics.xml.in         | 13 ++++
- backgrounds/truchet.xml.in           | 13 ++++
- backgrounds/vnc.xml.in               | 13 ++++
- backgrounds/wood.xml.in              | 13 ++++
- 12 files changed, 142 insertions(+), 94 deletions(-)
- create mode 100644 backgrounds/blobs.xml.in
- create mode 100644 backgrounds/brush-strokes.xml.in
- create mode 100644 backgrounds/disco.xml.in
- create mode 100644 backgrounds/drool.xml.in
- delete mode 100644 backgrounds/gnome-backgrounds.xml.in
- create mode 100644 backgrounds/libadwaita.xml.in
- create mode 100644 backgrounds/pixels.xml.in
- create mode 100644 backgrounds/symbolics.xml.in
- create mode 100644 backgrounds/truchet.xml.in
- create mode 100644 backgrounds/vnc.xml.in
- create mode 100644 backgrounds/wood.xml.in
-
-diff --git a/backgrounds/blobs.xml.in b/backgrounds/blobs.xml.in
-new file mode 100644
-index 0000000..7964743
---- /dev/null
-+++ b/backgrounds/blobs.xml.in
-@@ -0,0 +1,13 @@
-+<?xml version="1.0"?>
-+<!DOCTYPE wallpapers SYSTEM "gnome-wp-list.dtd">
-+<wallpapers>
-+  <wallpaper deleted="false">
-+    <name>Blobs</name>
-+    <filename>@BACKGROUNDDIR@/blobs-l.svg</filename>
-+    <filename-dark>@BACKGROUNDDIR@/blobs-d.svg</filename-dark>
-+    <options>zoom</options>
-+    <shade_type>solid</shade_type>
-+    <pcolor>#3465a4</pcolor>
-+    <scolor>#000000</scolor>
-+  </wallpaper>
-+</wallpapers>
-diff --git a/backgrounds/brush-strokes.xml.in b/backgrounds/brush-strokes.xml.in
-new file mode 100644
-index 0000000..17c5672
---- /dev/null
-+++ b/backgrounds/brush-strokes.xml.in
-@@ -0,0 +1,13 @@
-+<?xml version="1.0"?>
-+<!DOCTYPE wallpapers SYSTEM "gnome-wp-list.dtd">
-+<wallpapers>
-+  <wallpaper deleted="false">
-+    <name>Brush Strokes</name>
-+    <filename>@BACKGROUNDDIR@/brush-strokes-l.jpg</filename>
-+    <filename-dark>@BACKGROUNDDIR@/brush-strokes-d.jpg</filename-dark>
-+    <options>zoom</options>
-+    <shade_type>solid</shade_type>
-+    <pcolor>#3465a4</pcolor>
-+    <scolor>#000000</scolor>
-+  </wallpaper>
-+</wallpapers>
-diff --git a/backgrounds/disco.xml.in b/backgrounds/disco.xml.in
-new file mode 100644
-index 0000000..3d61bd6
---- /dev/null
-+++ b/backgrounds/disco.xml.in
-@@ -0,0 +1,13 @@
-+<?xml version="1.0"?>
-+<!DOCTYPE wallpapers SYSTEM "gnome-wp-list.dtd">
-+<wallpapers>
-+  <wallpaper deleted="false">
-+    <name>Disco</name>
-+    <filename>@BACKGROUNDDIR@/disco-l.jpg</filename>
-+    <filename-dark>@BACKGROUNDDIR@/disco-d.jpg</filename-dark>
-+    <options>zoom</options>
-+    <shade_type>solid</shade_type>
-+    <pcolor>#3465a4</pcolor>
-+    <scolor>#000000</scolor>
-+  </wallpaper>
-+</wallpapers>
-diff --git a/backgrounds/drool.xml.in b/backgrounds/drool.xml.in
-new file mode 100644
-index 0000000..fbc9335
---- /dev/null
-+++ b/backgrounds/drool.xml.in
-@@ -0,0 +1,13 @@
-+<?xml version="1.0"?>
-+<!DOCTYPE wallpapers SYSTEM "gnome-wp-list.dtd">
-+<wallpapers>
-+  <wallpaper deleted="false">
-+    <name>Drool</name>
-+    <filename>@BACKGROUNDDIR@/drool-l.svg</filename>
-+    <filename-dark>@BACKGROUNDDIR@/drool-d.svg</filename-dark>
-+    <options>zoom</options>
-+    <shade_type>solid</shade_type>
-+    <pcolor>#3465a4</pcolor>
-+    <scolor>#000000</scolor>
-+  </wallpaper>
-+</wallpapers>
-diff --git a/backgrounds/gnome-backgrounds.xml.in b/backgrounds/gnome-backgrounds.xml.in
-deleted file mode 100644
-index 295ccd3..0000000
---- a/backgrounds/gnome-backgrounds.xml.in
-+++ /dev/null
-@@ -1,93 +0,0 @@
--<?xml version="1.0"?>
--<!DOCTYPE wallpapers SYSTEM "gnome-wp-list.dtd">
--<wallpapers>
--	<wallpaper deleted="false">
--		<name>2</name>
--		<filename>@BACKGROUNDDIR@/blobs-l.svg</filename>
--		<filename-dark>@BACKGROUNDDIR@/blobs-d.svg</filename-dark>
--		<options>zoom</options>
--    <pcolor>#ffffff</pcolor>
--    <scolor>#000000</scolor>
--	</wallpaper>
--
--	<wallpaper deleted="false">
--		<name>3</name>
--		<filename>@BACKGROUNDDIR@/brush-strokes-l.jpg</filename>
--		<filename-dark>@BACKGROUNDDIR@/brush-strokes-d.jpg</filename-dark>
--		<options>zoom</options>
--    <pcolor>#ffffff</pcolor>
--    <scolor>#000000</scolor>
--	</wallpaper>
--
--	<wallpaper deleted="false">
--		<name>4</name>
--		<filename>@BACKGROUNDDIR@/disco-l.jpg</filename>
--		<filename-dark>@BACKGROUNDDIR@/disco-d.jpg</filename-dark>
--		<options>zoom</options>
--    <pcolor>#ffffff</pcolor>
--    <scolor>#000000</scolor>
--	</wallpaper>
--
--	<wallpaper deleted="false">
--		<name>5</name>
--		<filename>@BACKGROUNDDIR@/truchet-l.jpg</filename>
--		<filename-dark>@BACKGROUNDDIR@/truchet-d.jpg</filename-dark>
--		<options>zoom</options>
--    <pcolor>#ffffff</pcolor>
--    <scolor>#000000</scolor>
--	</wallpaper>
--
--	<wallpaper deleted="false">
--		<name>6</name>
--		<filename>@BACKGROUNDDIR@/pixels-l.png</filename>
--		<filename-dark>@BACKGROUNDDIR@/pixels-d.png</filename-dark>
--		<options>zoom</options>
--    <pcolor>#ffffff</pcolor>
--    <scolor>#000000</scolor>
--	</wallpaper>
--
--	<wallpaper deleted="false">
--		<name>7</name>
--		<filename>@BACKGROUNDDIR@/symbolics-l.png</filename>
--		<filename-dark>@BACKGROUNDDIR@/symbolics-d.png</filename-dark>
--		<options>zoom</options>
--    <pcolor>#ffffff</pcolor>
--    <scolor>#000000</scolor>
--	</wallpaper>
--
--	<wallpaper deleted="false">
--		<name>8</name>
--		<filename>@BACKGROUNDDIR@/vnc-l.png</filename>
--		<filename-dark>@BACKGROUNDDIR@/vnc-d.png</filename-dark>
--		<options>zoom</options>
--    <pcolor>#ffffff</pcolor>
--    <scolor>#000000</scolor>
--	</wallpaper>
--
--	<wallpaper deleted="false">
--		<name>9</name>
--		<filename>@BACKGROUNDDIR@/wood-l.jpg</filename>
--		<filename-dark>@BACKGROUNDDIR@/wood-d.jpg</filename-dark>
--		<options>zoom</options>
--    <pcolor>#ffffff</pcolor>
--    <scolor>#000000</scolor>
--	</wallpaper>
--
--	<wallpaper deleted="false">
--		<name>10</name>
--		<filename>@BACKGROUNDDIR@/libadwaita-l.jpg</filename>
--		<filename-dark>@BACKGROUNDDIR@/libadwaita-d.jpg</filename-dark>
--		<options>zoom</options>
--    <pcolor>#ffffff</pcolor>
--    <scolor>#000000</scolor>
--	</wallpaper>
--
--	<wallpaper deleted="false">
--		<name>11</name>
--		<filename>@BACKGROUNDDIR@/drool-l.svg</filename>
--		<filename-dark>@BACKGROUNDDIR@/drool-d.svg</filename-dark>
--		<options>zoom</options>
--    <pcolor>#ffffff</pcolor>
--    <scolor>#000000</scolor>
--	</wallpaper>
--</wallpapers>
-diff --git a/backgrounds/libadwaita.xml.in b/backgrounds/libadwaita.xml.in
-new file mode 100644
-index 0000000..8206b4a
---- /dev/null
-+++ b/backgrounds/libadwaita.xml.in
-@@ -0,0 +1,13 @@
-+<?xml version="1.0"?>
-+<!DOCTYPE wallpapers SYSTEM "gnome-wp-list.dtd">
-+<wallpapers>
-+  <wallpaper deleted="false">
-+    <name>Libadwaita</name>
-+    <filename>@BACKGROUNDDIR@/libadwaita-l.jpg</filename>
-+    <filename-dark>@BACKGROUNDDIR@/libadwaita-d.jpg</filename-dark>
-+    <options>zoom</options>
-+    <shade_type>solid</shade_type>
-+    <pcolor>#3465a4</pcolor>
-+    <scolor>#000000</scolor>
-+  </wallpaper>
-+</wallpapers>
-diff --git a/backgrounds/meson.build b/backgrounds/meson.build
-index c967b9e..9014421 100644
---- a/backgrounds/meson.build
-+++ b/backgrounds/meson.build
-@@ -29,7 +29,18 @@ backgrounds = [
- 
- install_data(backgrounds, install_dir: backgrounddir)
- 
--foreach metadata : ['gnome-backgrounds.xml', 'adwaita.xml']
-+foreach metadata : [
-+  'adwaita.xml',
-+  'blobs.xml',
-+  'brush-strokes.xml',
-+  'disco.xml',
-+  'drool.xml',
-+  'libadwaita.xml',
-+  'pixels.xml',
-+  'symbolics.xml',
-+  'truchet.xml',
-+  'vnc.xml',
-+  'wood.xml']
-   configure_file(
-     input: metadata + '.in',
-     output: metadata,
-diff --git a/backgrounds/pixels.xml.in b/backgrounds/pixels.xml.in
-new file mode 100644
-index 0000000..b6f10af
---- /dev/null
-+++ b/backgrounds/pixels.xml.in
-@@ -0,0 +1,13 @@
-+<?xml version="1.0"?>
-+<!DOCTYPE wallpapers SYSTEM "gnome-wp-list.dtd">
-+<wallpapers>
-+  <wallpaper deleted="false">
-+    <name>Pixels</name>
-+    <filename>@BACKGROUNDDIR@/pixels-l.png</filename>
-+    <filename-dark>@BACKGROUNDDIR@/pixels-d.png</filename-dark>
-+    <options>zoom</options>
-+    <shade_type>solid</shade_type>
-+    <pcolor>#3465a4</pcolor>
-+    <scolor>#000000</scolor>
-+  </wallpaper>
-+</wallpapers>
-diff --git a/backgrounds/symbolics.xml.in b/backgrounds/symbolics.xml.in
-new file mode 100644
-index 0000000..1dae390
---- /dev/null
-+++ b/backgrounds/symbolics.xml.in
-@@ -0,0 +1,13 @@
-+<?xml version="1.0"?>
-+<!DOCTYPE wallpapers SYSTEM "gnome-wp-list.dtd">
-+<wallpapers>
-+  <wallpaper deleted="false">
-+    <name>Symbolics</name>
-+    <filename>@BACKGROUNDDIR@/symbolics-l.png</filename>
-+    <filename-dark>@BACKGROUNDDIR@/symbolics-d.png</filename-dark>
-+    <options>zoom</options>
-+    <shade_type>solid</shade_type>
-+    <pcolor>#3465a4</pcolor>
-+    <scolor>#000000</scolor>
-+  </wallpaper>
-+</wallpapers>
-diff --git a/backgrounds/truchet.xml.in b/backgrounds/truchet.xml.in
-new file mode 100644
-index 0000000..79eec83
---- /dev/null
-+++ b/backgrounds/truchet.xml.in
-@@ -0,0 +1,13 @@
-+<?xml version="1.0"?>
-+<!DOCTYPE wallpapers SYSTEM "gnome-wp-list.dtd">
-+<wallpapers>
-+  <wallpaper deleted="false">
-+    <name>Truchet</name>
-+    <filename>@BACKGROUNDDIR@/truchet-l.jpg</filename>
-+    <filename-dark>@BACKGROUNDDIR@/truchet-d.jpg</filename-dark>
-+    <options>zoom</options>
-+    <shade_type>solid</shade_type>
-+    <pcolor>#3465a4</pcolor>
-+    <scolor>#000000</scolor>
-+  </wallpaper>
-+</wallpapers>
-diff --git a/backgrounds/vnc.xml.in b/backgrounds/vnc.xml.in
-new file mode 100644
-index 0000000..8e80b03
---- /dev/null
-+++ b/backgrounds/vnc.xml.in
-@@ -0,0 +1,13 @@
-+<?xml version="1.0"?>
-+<!DOCTYPE wallpapers SYSTEM "gnome-wp-list.dtd">
-+<wallpapers>
-+  <wallpaper deleted="false">
-+    <name>VNC</name>
-+    <filename>@BACKGROUNDDIR@/vnc-l.png</filename>
-+    <filename-dark>@BACKGROUNDDIR@/vnc-d.png</filename-dark>
-+    <options>zoom</options>
-+    <shade_type>solid</shade_type>
-+    <pcolor>#3465a4</pcolor>
-+    <scolor>#000000</scolor>
-+  </wallpaper>
-+</wallpapers>
-diff --git a/backgrounds/wood.xml.in b/backgrounds/wood.xml.in
-new file mode 100644
-index 0000000..330bcec
---- /dev/null
-+++ b/backgrounds/wood.xml.in
-@@ -0,0 +1,13 @@
-+<?xml version="1.0"?>
-+<!DOCTYPE wallpapers SYSTEM "gnome-wp-list.dtd">
-+<wallpapers>
-+  <wallpaper deleted="false">
-+    <name>Wood</name>
-+    <filename>@BACKGROUNDDIR@/wood-l.jpg</filename>
-+    <filename-dark>@BACKGROUNDDIR@/wood-d.jpg</filename-dark>
-+    <options>zoom</options>
-+    <shade_type>solid</shade_type>
-+    <pcolor>#3465a4</pcolor>
-+    <scolor>#000000</scolor>
-+  </wallpaper>
-+</wallpapers>
--- 
-GitLab
-

gnome-backgrounds.spec

@@ -1,15 +1,13 @@
 %global tarball_version %%(echo %{version} | tr '~' '.')
 
 Name:    gnome-backgrounds
-Version: 42~beta
+Version: 42.0
-Release: 2%{?dist}
+Release: 1%{?dist}
 Summary: Desktop backgrounds packaged with the GNOME desktop
 
 License: CC-BY-SA
 URL:     https://gitlab.gnome.org/GNOME/gnome-backgrounds
 Source0: https://download.gnome.org/sources/%{name}/42/%{name}-%{tarball_version}.tar.xz
-# https://bugzilla.redhat.com/show_bug.cgi?id=2061290
-Patch0:  gnome-backgrounds-42.beta-split-xml.patch
 
 BuildArch: noarch
 BuildRequires: gettext
@@ -44,7 +42,7 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/backgrounds/images
 rm -rf $RPM_BUILD_ROOT%{_datadir}/locale
 
 %files
-%license COPYING_CCBYSA3
+%license COPYING
 %doc AUTHORS NEWS README.md
 %{_datadir}/gnome-background-properties/adwaita.xml
 %{_datadir}/gnome-background-properties/blobs.xml
@@ -83,6 +81,9 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/locale
 %{_datadir}/backgrounds/gnome/wood-l.jpg
 
 %changelog
+* Mon Mar 21 2022 David King <amigadave@amigadave.com> - 42.0-1
+- Update to 42.0
+
 * Thu Mar 10 2022 David King <amigadave@amigadave.com> - 42~beta-2
 - Move some backgrounds to base package (#2062471)
 

sources

@@ -1 +1 @@
-SHA512 (gnome-backgrounds-42.beta.tar.xz) = 9f0736c6e511e9693b86797fe0a1136965deb0055b01bc8a2a0252b796e19517be09bec713d75f4f7c778896f4f80cb04121dbca29d4b282d347ae337d4c2639
+SHA512 (gnome-backgrounds-42.0.tar.xz) = 31cfbc52ec96bc4ce77960620a895af7f10c1fc4d474b589d49f3d1198b41792ab443bf8d7a661e71778455ab066f034c7fb6655e96db028990de0788e464e1d