[cervisia] fix appdata FTBFS, kde-apps cleanup

[Rex Dieter]

commit bd6dde24b945fa29254b96bc264c7ca1489fac2d
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Jan 17 09:25:47 2015 -0600

    fix appdata FTBFS, kde-apps cleanup

 .gitignore    |   23 -----------------------
 cervisia.spec |   19 +++++++++++++------
 2 files changed, 13 insertions(+), 29 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 273b36a..dce402f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,24 +1 @@
-/cervisia-4.11.0.tar.xz
-/cervisia-4.11.1.tar.xz
-/cervisia-4.11.2.tar.xz
-/cervisia-4.11.3.tar.xz
-/cervisia-4.11.90.tar.xz
-/cervisia-4.11.95.tar.xz
-/cervisia-4.11.97.tar.xz
-/cervisia-4.12.0.tar.xz
-/cervisia-4.12.1.tar.xz
-/cervisia-4.12.2.tar.xz
-/cervisia-4.12.3.tar.xz
-/cervisia-4.12.90.tar.xz
-/cervisia-4.12.95.tar.xz
-/cervisia-4.12.97.tar.xz
-/cervisia-4.13.0.tar.xz
-/cervisia-4.13.1.tar.xz
-/cervisia-4.13.2.tar.xz
-/cervisia-4.13.3.tar.xz
-/cervisia-4.13.97.tar.xz
-/cervisia-4.14.0.tar.xz
-/cervisia-4.14.1.tar.xz
-/cervisia-4.14.2.tar.xz
-/cervisia-4.14.3.tar.xz
 /cervisia-14.12.1.tar.xz
diff --git a/cervisia.spec b/cervisia.spec
index ea1c223..dbe0770 100644
--- a/cervisia.spec
+++ b/cervisia.spec
@@ -13,7 +13,10 @@ URL:     https://projects.kde.org/projects/kde/kdesdk/cervisia
 %endif
 Source0: http://download.kde.org/%{stable}/applications/%{version}/src/%{name}-%{version}.tar.xz
 
-BuildRequires:  desktop-file-utils
+BuildRequires: desktop-file-utils
+%if 0%{?fedora} > 19
+BuildRequires: libappstream-glib
+%endif
 BuildRequires: kdelibs4-devel >= 4.14
 
 Conflicts:      kdesdk-common < 4.10.80
@@ -24,11 +27,11 @@ Obsoletes:      kdesdk-cervisia < 4.10.80
 Cervisia is a CVS frontend for KDE
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q
 
 
 %build
-mkdir -p %{_target_platform}
+mkdir %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} ..
 popd
@@ -41,19 +44,23 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 %find_lang cervisia --with-kde --without-mo
 
+# fix/move appdata
+mkdir -p %{buildroot}%{_datadir}/appdata
+mv %{buildroot}%{_kde4_appsdir}/appdata/%{name}.appdata.xml %{buildroot}%{_datadir}/appdata/
+
+
 %check
+appstream-util validate-relax --nonet %{buildroot}%{_kde4_datadir}/appdata/%{name}.appdata.xml ||:
 desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/%{name}.desktop
 
 
 %post
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 
-
 %posttrans
 gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 update-mime-database %{_kde4_datadir}/mime >& /dev/null ||:
 
-
 %postun
 if [ $1 -eq 0 ] ; then
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
@@ -61,7 +68,6 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 update-mime-database %{_kde4_datadir}/mime >& /dev/null ||:
 fi
 
-
 %files -f cervisia.lang
 %doc COPYING COPYING.DOC ChangeLog README
 %{_kde4_bindir}/cervisia
@@ -71,6 +77,7 @@ fi
 %{_kde4_libdir}/kde4/cervisiapart.so
 %{_kde4_libdir}/libkdeinit4_cervisia.so
 %{_kde4_datadir}/applications/kde4/cervisia.desktop
+%{_datadir}/appdata/%{name}.appdata.xml
 %{_kde4_datadir}/config.kcfg/cervisiapart.kcfg
 %{_kde4_datadir}/dbus-1/interfaces/org.kde.cervisia*.xml
 %{_kde4_iconsdir}/hicolor/*/actions/*cervisia.*