From 84fc4132780df4b3466e3389afe3b6f349f9da94 Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Feb 04 2019 11:30:55 +0000
Subject: Use standard vala packaging pattern where vapi files are in -devel


---

diff --git a/appstream.spec b/appstream.spec
index b009853..f530b9a 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.12.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 # lib LGPLv2+, tools GPLv2+
 License: GPLv2+ and LGPLv2+
@@ -37,13 +37,14 @@ BuildRequires: pkgconfig(Qt5Core)
 BuildRequires: qt5-linguist
 BuildRequires: pkgconfig(yaml-0.1)
 BuildRequires: publican
+BuildRequires: vala
 BuildRequires: xmlto
 
 Requires: appstream-data
 
-%if ! 0%{?vala}
-Obsoletes: appstream-vala < 0.7.3
-%endif
+# -vala subpackage removed in F30
+Obsoletes: appstream-vala < 0.12.4-3
+Provides: appstream-vala = %{version}-%{release}
 
 %description
 AppStream makes it easy to access application information from the
@@ -68,16 +69,6 @@ Requires: pkgconfig(Qt5Core)
 %description qt-devel
 %{summary}.
 
-%if 0%{?vala}
-%package vala
-Summary: Vala bindings for %{name}
-Requires: %{name}%{?_isa} = %{version}-%{release}
-BuildRequires: vala-tools
-Requires: vala
-%description vala
-%{summary}.
-%endif
-
 
 %prep
 %autosetup -n AppStream-%{version} -p1
@@ -160,6 +151,12 @@ mv %{buildroot}%{_datadir}/metainfo/*.xml \
 %{_libdir}/pkgconfig/appstream.pc
 %dir %{_datadir}/gir-1.0/
 %{_datadir}/gir-1.0/AppStream-1.0.gir
+%if 0%{?vala}
+%dir %{_datadir}/vala
+%dir %{_datadir}/vala/vapi
+%{_datadir}/vala/vapi/appstream.deps
+%{_datadir}/vala/vapi/appstream.vapi
+%endif
 %{_docdir}/appstream/html/
 ## symlink pointing to ^^, but need to take care, since rpm has
 ## trouble replacing dirs with symlinks, omit it for now -- rex
@@ -176,14 +173,11 @@ mv %{buildroot}%{_datadir}/metainfo/*.xml \
 %{_libdir}/cmake/AppStreamQt/
 %{_libdir}/libAppStreamQt.so
 
-%if 0%{?vala}
-%files vala
-%{_datadir}/vala/vapi/appstream.deps
-%{_datadir}/vala/vapi/appstream.vapi
-%endif
-
 
 %changelog
+* Mon Feb 04 2019 Kalev Lember <klember@redhat.com> - 0.12.4-3
+- Use standard vala packaging pattern where vapi files are in -devel
+
 * Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.12.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild