From 19a84eb802b059793a2cb1ff076b5562ec5df6af Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Thu, 14 Sep 2017 14:13:16 +0200
Subject: [PATCH] Update to 3.26.1

... and switch back to autotools as meson files are missing from the
tarball.
---
 .gitignore             |  2 ++
 gnome-backgrounds.spec | 24 ++++++++++++++++--------
 sources                |  2 +-
 wallpaper.its          | 12 ++++++++++++
 wallpaper.loc          | 10 ++++++++++
 5 files changed, 41 insertions(+), 9 deletions(-)
 create mode 100644 wallpaper.its
 create mode 100644 wallpaper.loc

diff --git a/.gitignore b/.gitignore
index c0686a9..5a106b7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,3 +47,5 @@ gnome-backgrounds-2.30.0.tar.bz2
 /gnome-backgrounds-3.23.91.tar.xz
 /gnome-backgrounds-3.24.0.tar.xz
 /gnome-backgrounds-3.25.4.tar.xz
+/gnome-backgrounds-3.26.0.tar.xz
+/gnome-backgrounds-3.26.1.tar.xz
diff --git a/gnome-backgrounds.spec b/gnome-backgrounds.spec
index 9cdc753..9267bf5 100644
--- a/gnome-backgrounds.spec
+++ b/gnome-backgrounds.spec
@@ -1,17 +1,19 @@
 Name: gnome-backgrounds
-Version: 3.25.4
+Version: 3.26.1
 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.25/%{name}-%{version}.tar.xz
+Source0: https://download.gnome.org/sources/%{name}/3.26/%{name}-%{version}.tar.xz
+# Missing from 3.26.1 tarball
+Source1: wallpaper.its
+Source2: wallpaper.loc
 
 Patch0: move-adwaita-backgrounds.patch
 
 BuildArch: noarch
 BuildRequires: gettext
-BuildRequires: meson
 # Make sure both gnome-backgrounds and -extras get installed on upgrades
 Obsoletes: gnome-backgrounds < 3.24.0-3
 
@@ -34,12 +36,14 @@ which are packaged with the GNOME desktop.
 %setup -q
 %patch0 -p1
 
+cp -a %{S:1} %{S:2} its/
+
 %build
-%meson
-%meson_build
+%configure
+%make_build
 
 %install
-%meson_install
+%make_install
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/backgrounds/images
 
@@ -70,14 +74,18 @@ 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
 %{_datadir}/backgrounds/gnome/Waves.jpg
 
-
 %changelog
+* Thu Sep 14 2017 Kalev Lember <klember@redhat.com> - 3.26.1-1
+- Update to 3.26.1
+
+* Thu Sep 14 2017 Kalev Lember <klember@redhat.com> - 3.26.0-1
+- Update to 3.26.0
+
 * Tue Aug 01 2017 Kalev Lember <klember@redhat.com> - 3.25.4-1
 - Update to 3.25.4
 - Rebase move-adwaita-backgrounds.patch
diff --git a/sources b/sources
index 03b5b05..9613608 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gnome-backgrounds-3.25.4.tar.xz) = ab7ce396bce13b28d7495785ddf332fb13cf3f8b04c710ec723493e6e594ae96fc6698db80527d5b0cd9ab1664c3919dba9e8910beadbe7e90704b39db00e950
+SHA512 (gnome-backgrounds-3.26.1.tar.xz) = 2b8a62edafc610c3280a2c2d1be52f2c3d9c47d6443f676cde365a03fd75dbf30385b6db0602f58e8833235ccfe8574e23b4fd6fc41dfeb8426dd934aecd5b77
diff --git a/wallpaper.its b/wallpaper.its
new file mode 100644
index 0000000..b08a8b2
--- /dev/null
+++ b/wallpaper.its
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!--
+See the gettext documentation for the file format:
+http://www.gnu.org/software/gettext/manual/html_node/Preparing-ITS-Rules.html
+-->
+<its:rules xmlns:its="http://www.w3.org/2005/11/its"
+           xmlns:gt="https://www.gnu.org/s/gettext/ns/its/extensions/1.0"
+           version="2.0">
+  <its:translateRule selector="/wallpapers" translate="no"/>
+
+  <its:translateRule selector="//name" translate="yes"/>
+</its:rules>
diff --git a/wallpaper.loc b/wallpaper.loc
new file mode 100644
index 0000000..506073b
--- /dev/null
+++ b/wallpaper.loc
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!--
+See the gettext documentation for the file format:
+http://www.gnu.org/software/gettext/manual/html_node/Preparing-ITS-Rules.html
+-->
+<locatingRules>
+  <locatingRule name="wallpaper" pattern="*.xml">
+    <documentRule localName="wallpapers" target="wallpaper.its"/>
+  </locatingRule>
+</locatingRules>