From 31b3cf27c99ff809787eec62cece32586bb5e1c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Wed, 3 Feb 2021 15:02:18 +0000 Subject: [PATCH] Fix enablement of wxi tests and cut down deps chain MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Daniel P. Berrangé --- msitools.spec | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/msitools.spec b/msitools.spec index 739bd20..a611eac 100644 --- a/msitools.spec +++ b/msitools.spec @@ -12,7 +12,7 @@ Name: msitools Version: 0.101 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Windows Installer tools License: GPLv2+ @@ -23,7 +23,7 @@ Requires: libgsf >= 1.14.24-2 BuildRequires: git-core BuildRequires: meson -BuildRequires: intltool +BuildRequires: gettext BuildRequires: glib2-devel BuildRequires: gobject-introspection-devel BuildRequires: libgcab1-devel >= 0.2 @@ -32,7 +32,7 @@ BuildRequires: vala BuildRequires: bison %if %{with_validate} -BuildRequires: perl +BuildRequires: perl-base BuildRequires: perl-XML-XPath BuildRequires: mingw32-adwaita-icon-theme BuildRequires: mingw64-adwaita-icon-theme @@ -218,7 +218,11 @@ The libmsi1-devel package includes the header files for libmsi. %autosetup -S git_am -n msitools-%{version}%{?_version_suffix} %build +%if %{with_validate} +%meson -Dvalidate-wxi=true +%else %meson +%endif %meson_build %install @@ -226,10 +230,8 @@ The libmsi1-devel package includes the header files for libmsi. %find_lang %{name} -%if %{with_validate} %check %meson_test -%endif %ldconfig_scriptlets -n libmsi1 @@ -259,6 +261,10 @@ The libmsi1-devel package includes the header files for libmsi. %changelog +* Wed Feb 3 2021 Daniel P. Berrangé - 0.101-2 +- Fix enablement of wxi tests +- Use perl-base and gettext for more minimal dep chain + * Tue Feb 02 2021 Marc-André Lureau - 0.101-1 - new version v0.101 - Fix FTBFS. rhbz#1923683