From a21f81db06ced8ddecd772a5c40493acd64e3c72 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sat, 27 Aug 2016 10:49:13 +0200 Subject: [PATCH] Update to 3.21.91.1 --- .gitignore | 1 + 0001-build-Fix-appdata-installation.patch | 29 +++++++++++++++++++++++ gnome-characters.spec | 9 +++++-- sources | 2 +- 4 files changed, 38 insertions(+), 3 deletions(-) create mode 100644 0001-build-Fix-appdata-installation.patch diff --git a/.gitignore b/.gitignore index c4e2012..4e3cf30 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /gnome-characters-3.19.92.tar.xz /gnome-characters-3.20.0.tar.xz /gnome-characters-3.20.1.tar.xz +/gnome-characters-3.21.91.1.tar.xz diff --git a/0001-build-Fix-appdata-installation.patch b/0001-build-Fix-appdata-installation.patch new file mode 100644 index 0000000..f77e2e0 --- /dev/null +++ b/0001-build-Fix-appdata-installation.patch @@ -0,0 +1,29 @@ +From cdbb6a50131810c154720d614f87b0f54860418f Mon Sep 17 00:00:00 2001 +From: Kalev Lember +Date: Sat, 27 Aug 2016 10:39:03 +0200 +Subject: [PATCH] build: Fix appdata installation + +Add back @APPSTREAM_XML_RULES@ that got accidentally lost in the gettext +conversion. + +https://bugzilla.gnome.org/show_bug.cgi?id=770472 +--- + data/Makefile.am | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/data/Makefile.am b/data/Makefile.am +index 8115716..3c346f9 100644 +--- a/data/Makefile.am ++++ b/data/Makefile.am +@@ -25,6 +25,8 @@ gsettings_SCHEMAS = org.gnome.Characters.gschema.xml + + appstream_XML = org.gnome.Characters.appdata.xml + ++@APPSTREAM_XML_RULES@ ++ + org.gnome.Characters.appdata.xml: org.gnome.Characters.appdata.xml.in + $(AM_V_GEN) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@ + +-- +2.7.4 + diff --git a/gnome-characters.spec b/gnome-characters.spec index eb0b0b1..0204abf 100644 --- a/gnome-characters.spec +++ b/gnome-characters.spec @@ -1,14 +1,16 @@ %global appname org.gnome.Characters Name: gnome-characters -Version: 3.20.1 +Version: 3.21.91.1 Release: 1%{?dist} Summary: Character map application for GNOME # Files from gtk-js-app are licensed under 3-clause BSD. # Other files are GPL 2.0 or later. License: BSD and GPLv2+ URL: https://wiki.gnome.org/Design/Apps/CharacterMap -Source0: https://download.gnome.org/sources/gnome-characters/3.20/%{name}-%{version}.tar.xz +Source0: https://download.gnome.org/sources/gnome-characters/3.21/%{name}-%{version}.tar.xz +# https://bugzilla.gnome.org/show_bug.cgi?id=770472 +Patch0: 0001-build-Fix-appdata-installation.patch # This package uses GtkWidget template, which was added in Gjs 1.43.3. BuildRequires: gjs-devel >= 1.43.3, gtk3-devel, intltool, desktop-file-utils @@ -82,6 +84,9 @@ gtk-update-icon-cache %{_datadir}/icons/gnome &>/dev/null || : %changelog +* Sat Aug 27 2016 Kalev Lember - 3.21.91.1-1 +- Update to 3.21.91.1 + * Wed Apr 13 2016 Kalev Lember - 3.20.1-1 - Update to 3.20.1 diff --git a/sources b/sources index 983d288..e598217 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5e1ce3cd54bede98aa0ee9cb9dd7934c gnome-characters-3.20.1.tar.xz +4c6f51640cd6a4c3223714573a33fc7f gnome-characters-3.21.91.1.tar.xz