From 5b8cb0c6978e3b42bf4db19813c847f039c01110 Mon Sep 17 00:00:00 2001
From: David King <amigadave@amigadave.com>
Date: Tue, 17 Dec 2013 10:19:57 +0000
Subject: [PATCH] Update to 3.11.3

---
 .gitignore                          |  1 +
 gnome-logs-fix-appdata-xml-m4.patch | 24 ----------------------
 gnome-logs.spec                     | 31 +++++++++++++++++++++++------
 sources                             |  2 +-
 4 files changed, 27 insertions(+), 31 deletions(-)
 delete mode 100644 gnome-logs-fix-appdata-xml-m4.patch

diff --git a/.gitignore b/.gitignore
index 442822f..74ae35a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /gnome-logs-3.11.2.tar.xz
+/gnome-logs-3.11.3.tar.xz
diff --git a/gnome-logs-fix-appdata-xml-m4.patch b/gnome-logs-fix-appdata-xml-m4.patch
deleted file mode 100644
index ac8af80..0000000
--- a/gnome-logs-fix-appdata-xml-m4.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -urN gnome-logs-3.11.2.old/aclocal.m4 gnome-logs-3.11.2/aclocal.m4
---- gnome-logs-3.11.2.old/aclocal.m4	2013-11-18 22:40:00.000000000 +0000
-+++ gnome-logs-3.11.2/aclocal.m4	2013-12-12 19:16:33.396241488 +0000
-@@ -1385,7 +1385,7 @@
- mostlyclean-am: clean-appdata-xml
- 
- %.appdata.valid: %.appdata.xml
--	$(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; $(APPDATA_VALIDATE) $${d}$< && touch [$]@
-+	$(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; $(APPDATA_VALIDATE) --nonet $${d}$< && touch [$]@
- 
- all-am: $(appdata_XML:.appdata.xml=.appdata.valid)
- uninstall-am: uninstall-appdata-xml
-diff -urN gnome-logs-3.11.2.old/configure gnome-logs-3.11.2/configure
---- gnome-logs-3.11.2.old/configure	2013-11-18 22:40:00.000000000 +0000
-+++ gnome-logs-3.11.2/configure	2013-12-12 19:21:14.491248666 +0000
-@@ -4618,7 +4618,7 @@
- mostlyclean-am: clean-appdata-xml
- 
- %.appdata.valid: %.appdata.xml
--	$(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; $(APPDATA_VALIDATE) $${d}$< && touch $@
-+	$(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; $(APPDATA_VALIDATE) --nonet $${d}$< && touch $@
- 
- all-am: $(appdata_XML:.appdata.xml=.appdata.valid)
- uninstall-am: uninstall-appdata-xml
diff --git a/gnome-logs.spec b/gnome-logs.spec
index a00a7e6..65eb3c6 100644
--- a/gnome-logs.spec
+++ b/gnome-logs.spec
@@ -1,5 +1,5 @@
 Name:		gnome-logs
-Version:	3.11.2
+Version:	3.11.3
 Release:	1%{?dist}
 Summary:	A log viewer for the systemd journal
 
@@ -7,13 +7,13 @@ Group:		Applications/System
 License:	GPLv3+
 URL:		https://wiki.gnome.org/Apps/Logs
 Source0:	http://download.gnome.org/sources/gnome-logs/3.11/%{name}-%{version}.tar.xz
-# Fixed with appdata-tools > 0.1.6
-Patch0:		gnome-logs-fix-appdata-xml-m4.patch
 
-BuildRequires:	appdata-tools
 BuildRequires:	desktop-file-utils
+BuildRequires:	docbook-dtds
+BuildRequires:	docbook-style-xsl
 BuildRequires:	gtk3-devel
 BuildRequires:	intltool
+BuildRequires:	libxslt
 BuildRequires:	systemd-devel
 Requires:	gsettings-desktop-schemas
 
@@ -22,11 +22,10 @@ A log viewer for the systemd journal.
 
 %prep
 %setup -q
-%patch0 -p1
 
 
 %build
-%configure --disable-maintainer-mode
+%configure
 make V=1 %{?_smp_mflags}
 
 
@@ -39,13 +38,33 @@ make V=1 %{?_smp_mflags}
 desktop-file-validate %{buildroot}/%{_datadir}/applications/gnome-logs.desktop
 
 
+%post
+/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
+
+%postun
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
+
 %files -f gnome-logs.lang
 %doc AUTHORS COPYING README NEWS
 %{_bindir}/gnome-logs
 %{_datadir}/appdata/gnome-logs.appdata.xml
 %{_datadir}/applications/gnome-logs.desktop
+%{_datadir}/icons/hicolor/*/apps/gnome-logs.png
+%{_mandir}/man1/gnome-logs.1*
 
 
 %changelog
+* Tue Dec 17 2013 David King <amigadave@amigadave.com> - 3.11.3-1
+- Update to 3.11.3
+
 * Thu Dec 12 2013 David King <amigadave@amigadave.com> - 3.11.2-1
 - New package.
diff --git a/sources b/sources
index 0c633e6..a80e010 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-419753a956fa7ecb6c61b8ddf3eae8b1  gnome-logs-3.11.2.tar.xz
+b34f4baa45bc570a126904281344a3f8  gnome-logs-3.11.3.tar.xz