[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[Libosinfo] [libosinfo PATCH 5/7] spec: Use standard vala packaging pattern where vapi files are in -devel



This commit brings upstream the changes done on Fedora on
42b96ea66d7b3e.

Signed-off-by: Fabiano Fidêncio <fidencio redhat com>
---
 libosinfo.spec.in | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/libosinfo.spec.in b/libosinfo.spec.in
index 6aae7d7..3cf73ff 100644
--- a/libosinfo.spec.in
+++ b/libosinfo.spec.in
@@ -14,7 +14,9 @@ BuildRequires: glib2-devel
 BuildRequires: libxml2-devel >= 2.6.0
 BuildRequires: libxslt-devel >= 1.0.0
 BuildRequires: vala
+%if 0%{?fedora} < 30
 BuildRequires: vala-tools
+%endif
 BuildRequires: libcurl-devel
 BuildRequires: /usr/bin/pod2man
 BuildRequires: hwdata
@@ -34,6 +36,11 @@ Summary: Libraries, includes, etc. to compile with the libosinfo library
 Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig
 Requires: glib2-devel
+%if 0%{?fedora} >= 30
+# -vala subpackage removed in F30
+Obsoletes: libosinfo-vala < 1.3.0-3
+Provides: libosinfo-vala = %{version}-%{release}
+%endif
 
 %description devel
 libosinfo is a library that allows virtualization provisioning tools to
@@ -42,6 +49,7 @@ combination.
 
 Libraries, includes, etc. to compile with the libosinfo library
 
+%if 0%{?fedora} < 30
 %package vala
 Summary: Vala bindings
 Requires: %{name} = %{version}-%{release}
@@ -52,6 +60,7 @@ determine the optimal device settings for a hypervisor/operating system
 combination.
 
 This package provides the Vala bindings for libosinfo library.
+%endif
 
 %prep
 %setup -q
@@ -101,7 +110,12 @@ fi
 %{_datadir}/gir-1.0/Libosinfo-1.0.gir
 %{_datadir}/gtk-doc/html/Libosinfo
 
+%if 0%{?fedora} < 30
 %files vala
+%else
+%dir %{_datadir}/vala
+%dir %{_datadir}/vala/vapi
+%endif
 %{_datadir}/vala/vapi/libosinfo-1.0.vapi
 
 %changelog
-- 
2.20.1


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]