Fix enablement of wxi tests and cut down deps chain

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2021-02-03 15:02:18 +00:00
parent 8a351c8268
commit 31b3cf27c9

View File

@ -12,7 +12,7 @@
Name: msitools Name: msitools
Version: 0.101 Version: 0.101
Release: 1%{?dist} Release: 2%{?dist}
Summary: Windows Installer tools Summary: Windows Installer tools
License: GPLv2+ License: GPLv2+
@ -23,7 +23,7 @@ Requires: libgsf >= 1.14.24-2
BuildRequires: git-core BuildRequires: git-core
BuildRequires: meson BuildRequires: meson
BuildRequires: intltool BuildRequires: gettext
BuildRequires: glib2-devel BuildRequires: glib2-devel
BuildRequires: gobject-introspection-devel BuildRequires: gobject-introspection-devel
BuildRequires: libgcab1-devel >= 0.2 BuildRequires: libgcab1-devel >= 0.2
@ -32,7 +32,7 @@ BuildRequires: vala
BuildRequires: bison BuildRequires: bison
%if %{with_validate} %if %{with_validate}
BuildRequires: perl BuildRequires: perl-base
BuildRequires: perl-XML-XPath BuildRequires: perl-XML-XPath
BuildRequires: mingw32-adwaita-icon-theme BuildRequires: mingw32-adwaita-icon-theme
BuildRequires: mingw64-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} %autosetup -S git_am -n msitools-%{version}%{?_version_suffix}
%build %build
%if %{with_validate}
%meson -Dvalidate-wxi=true
%else
%meson %meson
%endif
%meson_build %meson_build
%install %install
@ -226,10 +230,8 @@ The libmsi1-devel package includes the header files for libmsi.
%find_lang %{name} %find_lang %{name}
%if %{with_validate}
%check %check
%meson_test %meson_test
%endif
%ldconfig_scriptlets -n libmsi1 %ldconfig_scriptlets -n libmsi1
@ -259,6 +261,10 @@ The libmsi1-devel package includes the header files for libmsi.
%changelog %changelog
* Wed Feb 3 2021 Daniel P. Berrangé <berrange@redhat.com> - 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 <marcandre.lureau@redhat.com> - 0.101-1 * Tue Feb 02 2021 Marc-André Lureau <marcandre.lureau@redhat.com> - 0.101-1
- new version v0.101 - new version v0.101
- Fix FTBFS. rhbz#1923683 - Fix FTBFS. rhbz#1923683