From c582c4c7f9564e5e3f2ba03ffa3b1534a0c02666 Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Aug 01 2017 09:04:21 +0000
Subject: Update to 3.25.4


- Rebase move-adwaita-backgrounds.patch
- Switch to the meson build system

---

diff --git a/.gitignore b/.gitignore
index 243c360..c0686a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,3 +46,4 @@ gnome-backgrounds-2.30.0.tar.bz2
 /gnome-backgrounds-3.22.1.tar.xz
 /gnome-backgrounds-3.23.91.tar.xz
 /gnome-backgrounds-3.24.0.tar.xz
+/gnome-backgrounds-3.25.4.tar.xz
diff --git a/gnome-backgrounds.spec b/gnome-backgrounds.spec
index 2d0f4e0..9cdc753 100644
--- a/gnome-backgrounds.spec
+++ b/gnome-backgrounds.spec
@@ -1,17 +1,17 @@
 Name: gnome-backgrounds
-Version: 3.24.0
-Release: 4%{?dist}
+Version: 3.25.4
+Release: 1%{?dist}
 Summary: Desktop backgrounds packaged with the GNOME desktop
 
 License: GPLv2
 URL: http://www.gnome.org
-Source0: https://download.gnome.org/sources/%{name}/3.24/%{name}-%{version}.tar.xz
+Source0: https://download.gnome.org/sources/%{name}/3.25/%{name}-%{version}.tar.xz
 
 Patch0: move-adwaita-backgrounds.patch
 
 BuildArch: noarch
-BuildRequires: intltool
 BuildRequires: gettext
+BuildRequires: meson
 # Make sure both gnome-backgrounds and -extras get installed on upgrades
 Obsoletes: gnome-backgrounds < 3.24.0-3
 
@@ -35,11 +35,11 @@ which are packaged with the GNOME desktop.
 %patch0 -p1
 
 %build
-%configure
-%make_build
+%meson
+%meson_build
 
 %install
-%make_install
+%meson_install
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/backgrounds/images
 
@@ -70,6 +70,7 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/locale
 %{_datadir}/backgrounds/gnome/Mirror.jpg
 %{_datadir}/backgrounds/gnome/Road.jpg
 %{_datadir}/backgrounds/gnome/Sandstone.jpg
+%{_datadir}/backgrounds/gnome/Signpost_of_the_Shadows.jpg
 %{_datadir}/backgrounds/gnome/Stones.jpg
 %{_datadir}/backgrounds/gnome/Terraform-green.jpg
 %{_datadir}/backgrounds/gnome/Waterfalls.jpg
@@ -77,6 +78,11 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/locale
 
 
 %changelog
+* Tue Aug 01 2017 Kalev Lember <klember@redhat.com> - 3.25.4-1
+- Update to 3.25.4
+- Rebase move-adwaita-backgrounds.patch
+- Switch to the meson build system
+
 * Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.24.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
 
diff --git a/move-adwaita-backgrounds.patch b/move-adwaita-backgrounds.patch
index e95576c..b9f492c 100644
--- a/move-adwaita-backgrounds.patch
+++ b/move-adwaita-backgrounds.patch
@@ -1,6 +1,5 @@
-diff -ruw gnome-backgrounds-3.24.0/backgrounds/adwaita.xml.in.in gnome-backgrounds-3.24.0-new/backgrounds/adwaita.xml.in.in
---- gnome-backgrounds-3.24.0/backgrounds/adwaita.xml.in.in	2014-11-27 05:00:42.000000000 +1000
-+++ gnome-backgrounds-3.24.0-new/backgrounds/adwaita.xml.in.in	2017-05-10 12:22:50.730448428 +1000
+--- gnome-backgrounds-3.25.4/backgrounds/adwaita.xml.in.in.kala	2017-07-31 23:26:47.044618378 +0100
++++ gnome-backgrounds-3.25.4/backgrounds/adwaita.xml.in.in	2017-07-31 23:31:50.359850200 +0100
 @@ -9,4 +9,13 @@
      <pcolor>#3465a4</pcolor>
      <scolor>#000000</scolor>
@@ -8,23 +7,22 @@ diff -ruw gnome-backgrounds-3.24.0/backgrounds/adwaita.xml.in.in gnome-backgroun
 +  <wallpaper deleted="false">
 +    <!-- TRANSLATORS: This is the name of this background picture: http://git.gnome.org/browse/gnome-backgrounds/plain/backgrounds/adwaita-night.jpg -
 +    You might want to translate it into the equivalent words of your language  -->
-+    <_name>Lock Screen</_name>
++    <name>Lock Screen</name>
 +    <filename>@datadir@/backgrounds/gnome/adwaita-lock.jpg</filename>
 +    <options>zoom</options>
 +    <pcolor>#ffffff</pcolor>
 +    <scolor>#000000</scolor>
 +  </wallpaper>
  </wallpapers>
-diff -ruw gnome-backgrounds-3.24.0/backgrounds/gnome-backgrounds.xml.in.in gnome-backgrounds-3.24.0-new/backgrounds/gnome-backgrounds.xml.in.in
---- gnome-backgrounds-3.24.0/backgrounds/gnome-backgrounds.xml.in.in	2016-09-01 21:56:13.000000000 +1000
-+++ gnome-backgrounds-3.24.0-new/backgrounds/gnome-backgrounds.xml.in.in	2017-05-10 11:21:00.072499917 +1000
+--- gnome-backgrounds-3.25.4/backgrounds/gnome-backgrounds.xml.in.in.kala	2017-07-31 23:26:38.816612089 +0100
++++ gnome-backgrounds-3.25.4/backgrounds/gnome-backgrounds.xml.in.in	2017-07-31 23:27:50.435666827 +0100
 @@ -65,24 +65,6 @@
      <scolor>#000000</scolor>
  	</wallpaper>
  	<wallpaper deleted="false">
 -		<!-- TRANSLATORS: This is the name of this background picture: http://git.gnome.org/browse/gnome-backgrounds/plain/backgrounds/adwaita-morning.jpg - 
 -		You might want to translate it into the equivalent words of your language  -->
--		<_name>Adwaita</_name>
+-		<name>Adwaita</name>
 -		<filename>@BACKGROUNDDIR@/adwaita-timed.xml</filename>
 -		<options>zoom</options>
 -    <pcolor>#ffffff</pcolor>
@@ -33,7 +31,7 @@ diff -ruw gnome-backgrounds-3.24.0/backgrounds/gnome-backgrounds.xml.in.in gnome
 -	<wallpaper deleted="false">
 -		<!-- TRANSLATORS: This is the name of this background picture: http://git.gnome.org/browse/gnome-backgrounds/plain/backgrounds/adwaita-night.jpg - 
 -		You might want to translate it into the equivalent words of your language  -->
--		<_name>Lock Screen</_name>
+-		<name>Lock Screen</name>
 -		<filename>@BACKGROUNDDIR@/adwaita-lock.jpg</filename>
 -		<options>zoom</options>
 -    <pcolor>#ffffff</pcolor>
@@ -42,4 +40,4 @@ diff -ruw gnome-backgrounds-3.24.0/backgrounds/gnome-backgrounds.xml.in.in gnome
 -		<wallpaper deleted="false">
  		<!-- TRANSLATORS: This is the name of this background picture: http://git.gnome.org/browse/gnome-backgrounds/plain/backgrounds/Mirror.jpg - 
  		You might want to translate it into the equivalent words of your language  -->
- 		<_name>Mirror</_name>
+ 		<name>Mirror</name>
diff --git a/sources b/sources
index 64146b4..03b5b05 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gnome-backgrounds-3.24.0.tar.xz) = ba044cd21d4c22dd6bf1a93a17579f2bc5f2b9198e40331486772f4fcb81a1c0179949a162e5a1e332f49cd833ca773cf27c1592966e94afbecd8b4d0728c24b
+SHA512 (gnome-backgrounds-3.25.4.tar.xz) = ab7ce396bce13b28d7495785ddf332fb13cf3f8b04c710ec723493e6e594ae96fc6698db80527d5b0cd9ab1664c3919dba9e8910beadbe7e90704b39db00e950