From d9ce78c82aa0d5dc4431a4580349b74807b66b4b Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@gmail.com>
Date: Fri, 29 Dec 2017 10:58:38 -0600
Subject: [PATCH] use metainfo dir for f28+

---
 appstream.spec | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/appstream.spec b/appstream.spec
index ca4982f..be65776 100644
--- a/appstream.spec
+++ b/appstream.spec
@@ -5,7 +5,7 @@
 Summary: Utilities to generate, maintain and access the AppStream database 
 Name:    appstream
 Version: 0.11.7
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 # lib LGPLv2+, tools GPLv2+
 License: GPLv2+ and LGPLv2+
@@ -17,12 +17,15 @@ Source0: http://www.freedesktop.org/software/appstream/releases/AppStream-%{vers
 
 ## upstreamable patches
 
+# needed for cmake auto-provides
 BuildRequires: cmake
 BuildRequires: meson
 BuildRequires: gettext
 BuildRequires: gtk-doc
 BuildRequires: intltool
 BuildRequires: itstool
+# for %%_kf5_metainfodir macro
+BuildRequires: kf5-rpm-macros
 BuildRequires: libstemmer-devel
 BuildRequires: pkgconfig(gio-2.0) pkgconfig(gobject-introspection-1.0)
 BuildRequires: pkgconfig(libxml-2.0)
@@ -79,9 +82,9 @@ Requires: vala
 
 %build
 %{meson} \
+ -Ddocs=true \
  -Dqt=true \
- -Dvapi=true \
- -Ddocs=true
+ -Dvapi=%{?vala:true}%{!?vala:false}
 
 %{meson_build}
 
@@ -94,10 +97,12 @@ touch %{buildroot}/var/cache/app-info/cache.watch
 
 %find_lang appstream
 
-# move metainfo to right/legacy location, at least until our tools can handle it
-mkdir -p %{buildroot}%{_datadir}/appdata/
+%if "%{?_kf5_metainfodir}" != "%{_datadir}/metainfo"
+# move metainfo to right/legacy location
+mkdir -p %{buildroot}%{_kf5_metainfodir}
 mv %{buildroot}%{_datadir}/metainfo/*.xml \
-   %{buildroot}%{_datadir}/appdata/
+   %{buildroot}%{_kf5_metainfodir}
+%endif
 
 
 %check
@@ -136,7 +141,7 @@ mv %{buildroot}%{_datadir}/metainfo/*.xml \
 %{_libdir}/girepository-1.0/AppStream-1.0.typelib
 %{_libdir}/libappstream.so.4*
 %{_libdir}/libappstream.so.%{version}
-%{_datadir}/appdata/org.freedesktop.appstream.cli.*.xml
+%{_kf5_metainfodir}/org.freedesktop.appstream.cli.*.xml
 # put in -devel? -- rex
 %{_datadir}/gettext/its/metainfo.*
 %ghost /var/cache/app-info/cache.watch
@@ -176,6 +181,9 @@ mv %{buildroot}%{_datadir}/metainfo/*.xml \
 
 
 %changelog
+* Fri Dec 29 2017 Rex Dieter <rdieter@fedoraproject.org> - 0.11.7-2
+- use metainfo dir for f28+
+
 * Fri Nov 03 2017 Rex Dieter <rdieter@fedoraproject.org> - 0.11.7-1
 - 0.11.7