Update to 3.26.1

... and switch back to autotools as meson files are missing from the
tarball.
This commit is contained in:
Kalev Lember 2017-09-14 14:13:16 +02:00
parent c582c4c7f9
commit 19a84eb802
5 changed files with 41 additions and 9 deletions

2
.gitignore vendored
View File

@ -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

View File

@ -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

View File

@ -1 +1 @@
SHA512 (gnome-backgrounds-3.25.4.tar.xz) = ab7ce396bce13b28d7495785ddf332fb13cf3f8b04c710ec723493e6e594ae96fc6698db80527d5b0cd9ab1664c3919dba9e8910beadbe7e90704b39db00e950
SHA512 (gnome-backgrounds-3.26.1.tar.xz) = 2b8a62edafc610c3280a2c2d1be52f2c3d9c47d6443f676cde365a03fd75dbf30385b6db0602f58e8833235ccfe8574e23b4fd6fc41dfeb8426dd934aecd5b77

12
wallpaper.its Normal file
View File

@ -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>

10
wallpaper.loc Normal file
View File

@ -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>