[kmymoney] 4.7.0

[Rex Dieter]

commit eb6d045956012fd4446250935bbfb2cdc9fa5da9
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Oct 4 04:35:45 2014 -0500

    4.7.0

 .gitignore    |    1 +
 kmymoney.spec |   24 +++++++++++++++---------
 sources       |    3 +--
 3 files changed, 17 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3cb825e..701fb8e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /kmymoney-4.6.6.tar.xz
 /kmymoney.appdata.xml
+/kmymoney-4.7.0.tar.xz
diff --git a/kmymoney.spec b/kmymoney.spec
index 3b3988a..f1eade3 100644
--- a/kmymoney.spec
+++ b/kmymoney.spec
@@ -1,18 +1,17 @@
 
 Summary: Personal finance 
 Name:    kmymoney
-Version: 4.6.6
-Release: 4%{?dist}
+Version: 4.7.0
+Release: 1%{?dist}
 
 # kmm itself is GPLv2+ 
 # bundled kdchart is GPLv2 or GPLv3, but currently not using it
 License: GPLv2+
 Url:     http://kmymoney2.sourceforge.net/
 Source0: http://download.kde.org/stable/kmymoney/%{version}/src/kmymoney-%{version}.tar.xz
-# backport appdata from 4.7.0
-Source1: kmymoney.appdata.xml
 
 ## upstreamable patches
+Patch1: kmymoney-4.7.0-appdata_validate.patch
 
 ## upstream patches
 
@@ -26,6 +25,9 @@ BuildRequires: gmp-devel
 BuildRequires: kdchart-devel
 BuildRequires: kdelibs4-devel >= 4.7.0
 BuildRequires: kdepimlibs-devel
+%if 0%{?fedora} > 19
+BuildRequires: libappstream-glib
+%endif
 BuildRequires: pkgconfig(aqbanking) >= 5.0
 BuildRequires: pkgconfig(libalkimia)
 BuildRequires: pkgconfig(libical)
@@ -81,8 +83,10 @@ BuildArch: noarch
 %prep
 %setup -q -n kmymoney-%{version}
 
+%patch1 -p1 -b .appdata_validate
+
 ## kdchart munging begin
-sed -i.kdchart -e 's|ADD_SUBDIRECTORY( libkdchart )|#ADD_SUBDIRECTORY( libkdchart )|' CMakeLists.txt
+sed -i.kdchart -e 's|add_subdirectory( libkdchart )|#add_subdirectory( libkdchart )|' CMakeLists.txt
 sed -i.kdchart -e 's|kmm_kdchart|kdchart|' kmymoney/CMakeLists.txt
 mv libkdchart libkdchart.kdchart
 mkdir libkdchart
@@ -103,14 +107,13 @@ make %{?_smp_mflags} -C %{_target_platform}
 %install
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-install -m644 -D -p %{SOURCE1} %{buildroot}%{_kde4_datadir}/appdata/kmymoney.appdata.xml
-
 %find_lang kmymoney --with-kde --without-mo && mv kmymoney.lang kmymoney-doc.lang
 %find_lang kmymoney 
 
 
 
 %check 
+appstream-util validate-relax --nonet %{buildroot}%{_kde4_datadir}/appdata/%{name}.appdata.xml ||:
 desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/kmymoney.desktop
 # make test
 
@@ -143,17 +146,17 @@ update-mime-database %{?fedora:-n} %{_kde4_datadir}/mime &> /dev/null || :
 %{_kde4_bindir}/kmymoney
 %{_kde4_appsdir}/kmymoney/
 %{_kde4_appsdir}/kmm_*/
+%{_kde4_appsdir}/kconf_update/kmymoney.upd
 %{_kde4_configdir}/csvimporterrc
 %{_kde4_datadir}/applications/kde4/kmymoney.desktop
 %{_kde4_datadir}/config.kcfg/kmymoney.kcfg
 %{_kde4_datadir}/kde4/services/*.desktop
 %{_kde4_datadir}/kde4/servicetypes/*.desktop
-%{_mandir}/man1/kmymoney.1.gz
 %{_kde4_datadir}/mime/packages/x-kmymoney.xml
 %{_kde4_iconsdir}/locolor/*/*/*
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_libdir}/kde4/*.so
-%{_kde4_datadir}/appdata/kmymoney.appdata.xml
+%{_kde4_datadir}/appdata/%{name}.appdata.xml
 
 %post libs -p /sbin/ldconfig
 %postun libs -p /sbin/ldconfig
@@ -171,6 +174,9 @@ update-mime-database %{?fedora:-n} %{_kde4_datadir}/mime &> /dev/null || :
 
 
 %changelog
+* Fri Oct 03 2014 Rex Dieter <rdieter at fedoraproject.org> 4.7.0-1
+- 4.7.0
+
 * Fri Oct 03 2014 Rex Dieter <rdieter at fedoraproject.org> 4.6.6-4
 - backport upstream appstreaam data from 4.7.0
 
diff --git a/sources b/sources
index f9d58d1..8edda43 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-c346d16683666d537ce4141498141829  kmymoney-4.6.6.tar.xz
-6afb397b570fba3226d04b82318eeb5a  kmymoney.appdata.xml
+a78b14b24165bf4da438d6ff47b9df59  kmymoney-4.7.0.tar.xz