From 940db3ae8baf98bcc8ad2090579212b517b89c7f9d1b6311b5fb3212027e1532 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Tue, 31 Aug 2021 06:39:52 +0000 Subject: [PATCH 1/2] Accepting request 914874 from home:awissu:branches:openSUSE:Factory - Create and install a Vala API file OBS-URL: https://build.opensuse.org/request/show/914874 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/AppStream?expand=0&rev=67 --- AppStream.changes | 5 +++++ AppStream.spec | 11 +++++++++++ 2 files changed, 16 insertions(+) diff --git a/AppStream.changes b/AppStream.changes index 3969a9c..ab2662f 100644 --- a/AppStream.changes +++ b/AppStream.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Aug 27 05:36:31 UTC 2021 - Alexei Podvalsky + +- Create and install a Vala API file + ------------------------------------------------------------------- Sun Aug 8 20:07:55 UTC 2021 - Luca Beltrame diff --git a/AppStream.spec b/AppStream.spec index 8ea913d..be188be 100644 --- a/AppStream.spec +++ b/AppStream.spec @@ -33,6 +33,7 @@ BuildRequires: gettext BuildRequires: gperf BuildRequires: lmdb-devel BuildRequires: meson >= 0.48 +BuildRequires: vala BuildRequires: pkgconfig BuildRequires: xsltproc BuildRequires: pkgconfig(Qt5Core) @@ -114,7 +115,11 @@ GObject introspection bindings for interfaces provided by AppStream. %build %meson -Dqt=true \ +%if 0%{?sle_version} >= 150300 && 0%{?is_opensuse} || 0%{?suse_version} > 1500 + -Dvapi=true \ +%else -Dvapi=false \ +%endif -Ddocs=false \ -Dapidocs=false \ -Dstemming=false @@ -169,6 +174,12 @@ appstreamcli refresh --force || true %{_includedir}/appstream/ %{_datadir}/gir-1.0/AppStream-1.0.gir %{_datadir}/gettext/ +%if 0%{?sle_version} >= 150300 && 0%{?is_opensuse} || 0%{?suse_version} > 1500 +%dir %{_datadir}/vala/ +%dir %{_datadir}/vala/vapi/ +%{_datadir}/vala/vapi/appstream.deps +%{_datadir}/vala/vapi/appstream.vapi +%endif %files -n typelib-1_0-AppStream-1.0 %license LICENSE* From 6e5cf46ba353ae7c0a474ed6128b0903526c8b84babdaf58ffc486094edf68d3 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Tue, 31 Aug 2021 06:43:48 +0000 Subject: [PATCH 2/2] Use %bcond_without vala instead OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/AppStream?expand=0&rev=68 --- AppStream.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/AppStream.spec b/AppStream.spec index be188be..05f0d24 100644 --- a/AppStream.spec +++ b/AppStream.spec @@ -16,6 +16,9 @@ # +%if 0%{?sle_version} >= 150300 && 0%{?is_opensuse} || 0%{?suse_version} > 1500 +%bcond_without vala +%endif %define libappstream_sover 4 %define libAppStreamQt_sover 2 Name: AppStream @@ -33,7 +36,9 @@ BuildRequires: gettext BuildRequires: gperf BuildRequires: lmdb-devel BuildRequires: meson >= 0.48 +%if %{with vala} BuildRequires: vala +%endif BuildRequires: pkgconfig BuildRequires: xsltproc BuildRequires: pkgconfig(Qt5Core) @@ -115,7 +120,7 @@ GObject introspection bindings for interfaces provided by AppStream. %build %meson -Dqt=true \ -%if 0%{?sle_version} >= 150300 && 0%{?is_opensuse} || 0%{?suse_version} > 1500 +%if %{with vala} -Dvapi=true \ %else -Dvapi=false \ @@ -174,7 +179,7 @@ appstreamcli refresh --force || true %{_includedir}/appstream/ %{_datadir}/gir-1.0/AppStream-1.0.gir %{_datadir}/gettext/ -%if 0%{?sle_version} >= 150300 && 0%{?is_opensuse} || 0%{?suse_version} > 1500 +%if %{with vala} %dir %{_datadir}/vala/ %dir %{_datadir}/vala/vapi/ %{_datadir}/vala/vapi/appstream.deps