From 112e6fcbe183b6caf5e311f9cdb866913eb16657 Mon Sep 17 00:00:00 2001 From: Victor Ryzhikh Date: Tue, 23 Oct 2018 05:45:24 +0300 Subject: [PATCH] Updated to 0.48.1 --- meson.spec | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/meson.spec b/meson.spec index e81d168..bba0706 100644 --- a/meson.spec +++ b/meson.spec @@ -1,4 +1,4 @@ -%bcond_with check +%bcond_without check Summary: High productivity build system Name: meson @@ -11,11 +11,13 @@ Source0: https://github.com/mesonbuild/meson/releases/download/%{version}/%{name Source1: https://github.com/mesonbuild/meson/releases/download/%{version}/%{name}-%{version}.tar.gz.asc Source2: %{name}.macros -BuildRequires: itstool -BuildRequires: ninja BuildRequires: python3-setuptools BuildRequires: pkgconfig(python3) +%if %{with check} +BuildRequires: locales +BuildRequires: ninja + # Various languages BuildRequires: gcc BuildRequires: gcc-c++ @@ -26,6 +28,7 @@ BuildRequires: gnustep-base-devel BuildRequires: java-devel BuildRequires: mono BuildRequires: pkgconfig(mono) +BuildRequires: rust # Various libs support BuildRequires: bison @@ -34,6 +37,7 @@ BuildRequires: gettext BuildRequires: git BuildRequires: gtk-doc BuildRequires: qt5-linguist-tools +BuildRequires: qt5-tools BuildRequires: vala BuildRequires: vala-tools BuildRequires: asan-devel @@ -41,9 +45,12 @@ BuildRequires: boost-devel BuildRequires: cups-devel BuildRequires: gmock-devel BuildRequires: gtest-devel -BuildRequires: itstool +BuildRequires: itstool +BuildRequires: locales-en BuildRequires: libwmf-devel BuildRequires: llvm-devel +BuildRequires: openmpi +BuildRequires: openmpi-devel BuildRequires: pcap-devel BuildRequires: texlive-epstopdf BuildRequires: wxgtku3.0-devel @@ -60,6 +67,7 @@ BuildRequires: pkgconfig(vapigen) BuildRequires: pkgconfig(zlib) BuildRequires: python3-gobject3 BuildRequires: python3-cython +%endif Requires: ninja Requires: python3-setuptools @@ -106,6 +114,10 @@ rm -rf "test cases/frameworks/15 llvm" # Cannot find libboost_thread.so which exists rm -rf "test cases/frameworks/1 boost" +rm -rf "test cases/frameworks/22 gir link order" + +rm -rf "test cases/common/190 openmp" + export MESON_PRINT_TEST_OUTPUT=1 export LC_ALL=UTF-8 %__python3 run_tests.py