From 95f6e458bb6f425b347929a8b6c5d1bcc2deef0e Mon Sep 17 00:00:00 2001 From: David King Date: Mon, 21 Mar 2022 13:57:28 +0000 Subject: [PATCH] Update to 42.0 --- .gitignore | 1 + gnome-backgrounds-42.beta-split-xml.patch | 348 ---------------------- gnome-backgrounds.spec | 11 +- sources | 2 +- 4 files changed, 8 insertions(+), 354 deletions(-) delete mode 100644 gnome-backgrounds-42.beta-split-xml.patch diff --git a/.gitignore b/.gitignore index 57fc10e..a448998 100644 --- a/.gitignore +++ b/.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 diff --git a/gnome-backgrounds-42.beta-split-xml.patch b/gnome-backgrounds-42.beta-split-xml.patch deleted file mode 100644 index 925a651..0000000 --- a/gnome-backgrounds-42.beta-split-xml.patch +++ /dev/null @@ -1,348 +0,0 @@ -From 45bc7738014449733398215a92c2ff6351d860eb Mon Sep 17 00:00:00 2001 -From: Jakub Steiner -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 @@ -+ -+ -+ -+ -+ Blobs -+ @BACKGROUNDDIR@/blobs-l.svg -+ @BACKGROUNDDIR@/blobs-d.svg -+ zoom -+ solid -+ #3465a4 -+ #000000 -+ -+ -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 @@ -+ -+ -+ -+ -+ Brush Strokes -+ @BACKGROUNDDIR@/brush-strokes-l.jpg -+ @BACKGROUNDDIR@/brush-strokes-d.jpg -+ zoom -+ solid -+ #3465a4 -+ #000000 -+ -+ -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 @@ -+ -+ -+ -+ -+ Disco -+ @BACKGROUNDDIR@/disco-l.jpg -+ @BACKGROUNDDIR@/disco-d.jpg -+ zoom -+ solid -+ #3465a4 -+ #000000 -+ -+ -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 @@ -+ -+ -+ -+ -+ Drool -+ @BACKGROUNDDIR@/drool-l.svg -+ @BACKGROUNDDIR@/drool-d.svg -+ zoom -+ solid -+ #3465a4 -+ #000000 -+ -+ -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 @@ -- -- -- -- -- 2 -- @BACKGROUNDDIR@/blobs-l.svg -- @BACKGROUNDDIR@/blobs-d.svg -- zoom -- #ffffff -- #000000 -- -- -- -- 3 -- @BACKGROUNDDIR@/brush-strokes-l.jpg -- @BACKGROUNDDIR@/brush-strokes-d.jpg -- zoom -- #ffffff -- #000000 -- -- -- -- 4 -- @BACKGROUNDDIR@/disco-l.jpg -- @BACKGROUNDDIR@/disco-d.jpg -- zoom -- #ffffff -- #000000 -- -- -- -- 5 -- @BACKGROUNDDIR@/truchet-l.jpg -- @BACKGROUNDDIR@/truchet-d.jpg -- zoom -- #ffffff -- #000000 -- -- -- -- 6 -- @BACKGROUNDDIR@/pixels-l.png -- @BACKGROUNDDIR@/pixels-d.png -- zoom -- #ffffff -- #000000 -- -- -- -- 7 -- @BACKGROUNDDIR@/symbolics-l.png -- @BACKGROUNDDIR@/symbolics-d.png -- zoom -- #ffffff -- #000000 -- -- -- -- 8 -- @BACKGROUNDDIR@/vnc-l.png -- @BACKGROUNDDIR@/vnc-d.png -- zoom -- #ffffff -- #000000 -- -- -- -- 9 -- @BACKGROUNDDIR@/wood-l.jpg -- @BACKGROUNDDIR@/wood-d.jpg -- zoom -- #ffffff -- #000000 -- -- -- -- 10 -- @BACKGROUNDDIR@/libadwaita-l.jpg -- @BACKGROUNDDIR@/libadwaita-d.jpg -- zoom -- #ffffff -- #000000 -- -- -- -- 11 -- @BACKGROUNDDIR@/drool-l.svg -- @BACKGROUNDDIR@/drool-d.svg -- zoom -- #ffffff -- #000000 -- -- -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 @@ -+ -+ -+ -+ -+ Libadwaita -+ @BACKGROUNDDIR@/libadwaita-l.jpg -+ @BACKGROUNDDIR@/libadwaita-d.jpg -+ zoom -+ solid -+ #3465a4 -+ #000000 -+ -+ -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 @@ -+ -+ -+ -+ -+ Pixels -+ @BACKGROUNDDIR@/pixels-l.png -+ @BACKGROUNDDIR@/pixels-d.png -+ zoom -+ solid -+ #3465a4 -+ #000000 -+ -+ -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 @@ -+ -+ -+ -+ -+ Symbolics -+ @BACKGROUNDDIR@/symbolics-l.png -+ @BACKGROUNDDIR@/symbolics-d.png -+ zoom -+ solid -+ #3465a4 -+ #000000 -+ -+ -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 @@ -+ -+ -+ -+ -+ Truchet -+ @BACKGROUNDDIR@/truchet-l.jpg -+ @BACKGROUNDDIR@/truchet-d.jpg -+ zoom -+ solid -+ #3465a4 -+ #000000 -+ -+ -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 @@ -+ -+ -+ -+ -+ VNC -+ @BACKGROUNDDIR@/vnc-l.png -+ @BACKGROUNDDIR@/vnc-d.png -+ zoom -+ solid -+ #3465a4 -+ #000000 -+ -+ -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 @@ -+ -+ -+ -+ -+ Wood -+ @BACKGROUNDDIR@/wood-l.jpg -+ @BACKGROUNDDIR@/wood-d.jpg -+ zoom -+ solid -+ #3465a4 -+ #000000 -+ -+ --- -GitLab - diff --git a/gnome-backgrounds.spec b/gnome-backgrounds.spec index b4565a3..7390c1c 100644 --- a/gnome-backgrounds.spec +++ b/gnome-backgrounds.spec @@ -1,15 +1,13 @@ %global tarball_version %%(echo %{version} | tr '~' '.') Name: gnome-backgrounds -Version: 42~beta -Release: 2%{?dist} +Version: 42.0 +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 - 42.0-1 +- Update to 42.0 + * Thu Mar 10 2022 David King - 42~beta-2 - Move some backgrounds to base package (#2062471) diff --git a/sources b/sources index 254ff8e..30164da 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-backgrounds-42.beta.tar.xz) = 9f0736c6e511e9693b86797fe0a1136965deb0055b01bc8a2a0252b796e19517be09bec713d75f4f7c778896f4f80cb04121dbca29d4b282d347ae337d4c2639 +SHA512 (gnome-backgrounds-42.0.tar.xz) = 31cfbc52ec96bc4ce77960620a895af7f10c1fc4d474b589d49f3d1198b41792ab443bf8d7a661e71778455ab066f034c7fb6655e96db028990de0788e464e1d