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

[Libosinfo] [osinfo-db-tools PATCH v2 09/16] spec: Adapt to use meson



The changes needed in the spec files are not so intrusive.

One thing that has to be mentioned is the requirement for
mingw-filesystem >= 107 (which is only present on Fedora 30+) in order
to generate the mingw rpms for osinfo-db-tools. This huge bump in the
version happened because the `%mingw_ninja_install` was only recently
introduced to mingw-filesystem package.

Signed-off-by: Fabiano Fidêncio <fidencio redhat com>
---
 mingw-osinfo-db-tools.spec.in | 14 +++++++-------
 osinfo-db-tools.spec.in       | 17 ++++++-----------
 2 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/mingw-osinfo-db-tools.spec.in b/mingw-osinfo-db-tools.spec.in
index 14e68c5..6d9fd95 100644
--- a/mingw-osinfo-db-tools.spec.in
+++ b/mingw-osinfo-db-tools.spec.in
@@ -5,15 +5,16 @@ Version: @VERSION@
 Release: 1%{?dist}%{?extra_release}
 Summary: MinGW Windows port of a library for managing OS information for virtualization
 License: LGPLv2+
-Source: https://releases.pagure.org/libosinfo/osinfo-db-tools-%{version}.tar.gz
+Source: https://releases.pagure.org/libosinfo/osinfo-db-tools-%{version}.tar.xz
 URL: https://libosinfo.org
 
 BuildArch: noarch
 
+BuildRequires: meson
 BuildRequires: gettext
 
-BuildRequires: mingw32-filesystem >= 95
-BuildRequires: mingw64-filesystem >= 95
+BuildRequires: mingw32-filesystem >= 107
+BuildRequires: mingw64-filesystem >= 107
 BuildRequires: mingw32-gcc
 BuildRequires: mingw64-gcc
 BuildRequires: mingw32-binutils
@@ -62,12 +63,11 @@ information about operating systems for use with virtualization
 %setup -q -n osinfo-db-tools-%{version}
 
 %build
-%mingw_configure
-%mingw_make %{?_smp_mflags}
-
+%mingw_meson
+%mingw_ninja
 
 %install
-%mingw_make_install DESTDIR=$RPM_BUILD_ROOT
+%mingw_ninja_install
 
 # Manpages don't need to be bundled
 rm -rf $RPM_BUILD_ROOT%{mingw32_datadir}/man
diff --git a/osinfo-db-tools.spec.in b/osinfo-db-tools.spec.in
index 459dde9..848ce3b 100644
--- a/osinfo-db-tools.spec.in
+++ b/osinfo-db-tools.spec.in
@@ -11,8 +11,9 @@ Name: osinfo-db-tools
 Version: @VERSION@
 Release: 1%{?dist}%{?extra_release}
 License: GPLv2+
-Source: https://releases.pagure.org/libosinfo/%{name}-%{version}.tar.gz
+Source: https://releases.pagure.org/libosinfo/%{name}-%{version}.tar.xz
 URL: https://libosinfo.org
+BuildRequires: meson
 BuildRequires: gcc
 BuildRequires: gettext-devel
 BuildRequires: glib2-devel
@@ -38,18 +39,12 @@ information about operating systems for use with virtualization
 %setup -q
 
 %build
-%configure
-%__make %{?_smp_mflags} V=1
-
-%check
-if ! make check
-then
-  cat tests/test-suite.log || true
-  exit 1
-fi
+%meson
+%meson_build
+%meson_test
 
 %install
-%__make install DESTDIR=%{buildroot}
+%meson_install
 
 %find_lang %{name}
 
-- 
2.21.0


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