From 378ae0ff17c8cc3b8420e3b515b27b279272e921 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Oct 12 2014 02:51:58 +0000
Subject: Merge branch 'master' into f20


---

diff --git a/.gitignore b/.gitignore
index 9e0b939..8ce402d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /kanagram-4.13.97.tar.xz
 /kanagram-4.14.0.tar.xz
 /kanagram-4.14.1.tar.xz
+/kanagram-4.14.2.tar.xz
diff --git a/kanagram.spec b/kanagram.spec
index 1a6c833..47b106b 100644
--- a/kanagram.spec
+++ b/kanagram.spec
@@ -1,6 +1,6 @@
 Name:    kanagram
 Summary: Letter Order Game 
-Version: 4.14.1
+Version: 4.14.2
 Release: 1%{?dist}
 
 License: GPLv2+
@@ -13,7 +13,9 @@ URL:     https://projects.kde.org/projects/kde/kdeedu/%{name}
 %endif
 Source0: http://download.kde.org/%{stable}/%{version}/src/%{name}-%{version}.tar.xz
 
+%if 0%{?fedora} > 19
 BuildRequires: appdata-tools
+%endif
 BuildRequires: desktop-file-utils
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: libkdeedu-devel >= %{version}
@@ -57,7 +59,7 @@ rm -vf %{buildroot}%{_kde4_iconsdir}/hicolor/80x80/apps/kanagram-harmattan.png
 
 
 %check
-appdata-validate --nonet --relax %{buildroot}%{_kde4_datadir}/appdata/%{name}.appdata.xml 
+appdata-validate --nonet --relax %{buildroot}%{_kde4_datadir}/appdata/%{name}.appdata.xml  ||:
 desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/%{name}.desktop
 
 
@@ -88,6 +90,9 @@ fi
 
 
 %changelog
+* Sun Oct 12 2014 Rex Dieter <rdieter@fedoraproject.org> - 4.14.2-1
+- 4.14.2
+
 * Tue Sep 16 2014 Rex Dieter <rdieter@fedoraproject.org> - 4.14.1-1
 - 4.14.1
 
diff --git a/sources b/sources
index f60ff09..70b7858 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b1f2d10905cb83a2f0cced51dfea72b4  kanagram-4.14.1.tar.xz
+1f0a1b93b3cb19cdb28a7f5be1e2db64  kanagram-4.14.2.tar.xz