From f954396d4d52318b9b7ef24ed8a777fc10080606 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9-=D0=97?= Date: Sat, 6 Apr 2019 17:50:52 +0000 Subject: [PATCH 1/6] Rebuild --- meson.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.spec b/meson.spec index 45ebf02..628dbda 100644 --- a/meson.spec +++ b/meson.spec @@ -3,7 +3,7 @@ Summary: High productivity build system Name: meson Version: 0.49.2 -Release: 2 +Release: 3 License: ASL 2.0 Group: Development/Tools Url: http://mesonbuild.com/ From ee0b74a6d36e0536f0083a2f52a302849f3c27e2 Mon Sep 17 00:00:00 2001 From: Andrey Bondrov Date: Sun, 14 Apr 2019 02:49:26 +0000 Subject: [PATCH 2/6] MassBuild#1671: Increase release tag --- meson.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.spec b/meson.spec index 628dbda..1760823 100644 --- a/meson.spec +++ b/meson.spec @@ -3,7 +3,7 @@ Summary: High productivity build system Name: meson Version: 0.49.2 -Release: 3 +Release: 4 License: ASL 2.0 Group: Development/Tools Url: http://mesonbuild.com/ From 40ece6daf087bf6afdabf06fe23ad6cd85dec9ce Mon Sep 17 00:00:00 2001 From: Giovanni Mariani Date: Wed, 15 May 2019 19:45:07 +0200 Subject: [PATCH 3/6] Updated to release 0.50.1, updated skipped tests list --- .abf.yml | 4 ++-- meson.spec | 47 ++++++++++++++++++++++++++++++++++++----------- 2 files changed, 38 insertions(+), 13 deletions(-) diff --git a/.abf.yml b/.abf.yml index f90b78f..391cfff 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,3 +1,3 @@ sources: - meson-0.49.2.tar.gz: 8b95506a04465abf1acafb5a5d9fc38918eeea0f - meson-0.49.2.tar.gz.asc: 40c8d8b17e36e778f7e0ab40dfa9b096bee2d5ea + meson-0.50.1.tar.gz: 0af4c31a23479ccae1619552752662e1591a9235 + meson-0.50.1.tar.gz.asc: 014a705d7f0f61e56d99c09ff130c2401bdcce5e diff --git a/meson.spec b/meson.spec index 45ebf02..8dfa62d 100644 --- a/meson.spec +++ b/meson.spec @@ -1,9 +1,10 @@ +# Running tests needs lot of time %bcond_with check Summary: High productivity build system Name: meson -Version: 0.49.2 -Release: 2 +Version: 0.50.1 +Release: 1 License: ASL 2.0 Group: Development/Tools Url: http://mesonbuild.com/ @@ -40,6 +41,8 @@ BuildRequires: itstool BuildRequires: locales-en BuildRequires: nasm BuildRequires: pkgconfig +BuildRequires: python3-gobject3 +BuildRequires: python3-cython BuildRequires: qt5-linguist-tools BuildRequires: qt5-tools BuildRequires: texlive-epstopdf @@ -60,14 +63,14 @@ BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(glib-sharp-2.0) BuildRequires: pkgconfig(gobject-introspection-1.0) BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(libgcrypt) BuildRequires: pkgconfig(protobuf) BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5Gui) BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(vapigen) +BuildRequires: pkgconfig(vulkan) BuildRequires: pkgconfig(zlib) -BuildRequires: python3-gobject3 -BuildRequires: python3-cython %endif Requires: ninja @@ -107,16 +110,38 @@ install -D -m 0644 %{SOURCE2} %{buildroot}%{_sys_macros_dir}/%{name}.macros %if %{with check} %check -# Lack of gmock and vulkan. -rm -rf "test cases/frameworks/3 gmock/" -rm -rf "test cases/frameworks/18 vulkan/" -# Remove MPI tests for now because it is complicated to run. -rm -rf "test cases/frameworks/17 mpi" -# Due to missing libtinfo -rm -rf "test cases/frameworks/15 llvm" +# TODO: Investigate and fix failures +# Missing compilers or their dependencies +rm -rf "test cases/fortran/1 basic/" +rm -rf "test cases/fortran/2 modules/" +rm -rf "test cases/fortran/3 module procedure/" +rm -rf "test cases/fortran/4 self dependency/" +rm -rf "test cases/fortran/5 static/" +rm -rf "test cases/fortran/6 dynamic/" +rm -rf "test cases/fortran/7 generated/" +rm -rf "test cases/fortran/8 module names/" +rm -rf "test cases/fortran/9 cpp/" +rm -rf "test cases/fortran/10 find library/" +rm -rf "test cases/fortran/11 compiles links runs/" +rm -rf "test cases/fortran/12 submodule/" +rm -rf "test cases/fortran/13 coarray/" +rm -rf "test cases/nasm/1 configure/" +rm -rf "test cases/rust/1 basic/" +# Lack of dependencies # Cannot find libboost_thread.so which exists rm -rf "test cases/frameworks/1 boost" +#rm -rf "test cases/frameworks/3 gmock/" +# Due to missing libtinfo +rm -rf "test cases/frameworks/15 llvm" +# Remove MPI tests for now because it is complicated to run. +rm -rf "test cases/frameworks/17 mpi" +rm -rf "test cases/frameworks/18 vulkan/" +rm -rf "test cases/frameworks/19 pcap/" +rm -rf "test cases/frameworks/20 cups/" +rm -rf "test cases/frameworks/21 libwmf/" rm -rf "test cases/frameworks/22 gir link order" +rm -rf "test cases/frameworks/24 libgcrypt/" +rm -rf "test cases/frameworks/26 netcdf/" rm -rf "test cases/common/190 openmp" export MESON_PRINT_TEST_OUTPUT=1 From 9b88dfa71a016bff66b569794ce98a2a02fff68f Mon Sep 17 00:00:00 2001 From: Date: Sat, 6 Jul 2019 19:21:29 +0000 Subject: [PATCH 4/6] MassBuild#1715: Increase release tag --- meson.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.spec b/meson.spec index 1760823..3963d83 100644 --- a/meson.spec +++ b/meson.spec @@ -3,7 +3,7 @@ Summary: High productivity build system Name: meson Version: 0.49.2 -Release: 4 +Release: 5 License: ASL 2.0 Group: Development/Tools Url: http://mesonbuild.com/ From 5ca541b20f4f7fc39df7eb191951a7304fa4e37d Mon Sep 17 00:00:00 2001 From: Mikhail Novosyolov Date: Wed, 10 Jul 2019 17:49:31 +0300 Subject: [PATCH 5/6] upd: 0.50.1 -> 0.51.1; dropped not used GPG signature --- .abf.yml | 3 +-- meson.spec | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.abf.yml b/.abf.yml index 391cfff..a008896 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,3 +1,2 @@ sources: - meson-0.50.1.tar.gz: 0af4c31a23479ccae1619552752662e1591a9235 - meson-0.50.1.tar.gz.asc: 014a705d7f0f61e56d99c09ff130c2401bdcce5e + meson-0.51.1.tar.gz: 69a5c05e6143c3c841334fe50cf6c79d27b777a5 diff --git a/meson.spec b/meson.spec index 8dfa62d..4f06671 100644 --- a/meson.spec +++ b/meson.spec @@ -3,13 +3,12 @@ Summary: High productivity build system Name: meson -Version: 0.50.1 +Version: 0.51.1 Release: 1 License: ASL 2.0 Group: Development/Tools Url: http://mesonbuild.com/ Source0: https://github.com/mesonbuild/meson/releases/download/%{version}/%{name}-%{version}.tar.gz -Source1: https://github.com/mesonbuild/meson/releases/download/%{version}/%{name}-%{version}.tar.gz.asc Source2: %{name}.macros BuildRequires: python3-setuptools From 5a4eaf2c6bf4be591d927a80513cb122a679cb1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B7=D0=B8=D0=BC?= Date: Fri, 11 Oct 2019 01:22:52 +0300 Subject: [PATCH 6/6] Updated to 0.52.0 --- .abf.yml | 2 +- meson.spec | 66 +++++++++++++++++++++++++++--------------------------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/.abf.yml b/.abf.yml index a008896..3d438b2 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,2 +1,2 @@ sources: - meson-0.51.1.tar.gz: 69a5c05e6143c3c841334fe50cf6c79d27b777a5 + meson-0.52.0.tar.gz: f5b924f5128f53f9eaeffc2e72ac3f757977a809 diff --git a/meson.spec b/meson.spec index 4f06671..e73ad8a 100644 --- a/meson.spec +++ b/meson.spec @@ -3,20 +3,20 @@ Summary: High productivity build system Name: meson -Version: 0.51.1 +Version: 0.52.0 Release: 1 License: ASL 2.0 Group: Development/Tools -Url: http://mesonbuild.com/ +Url: http://mesonbuild.com Source0: https://github.com/mesonbuild/meson/releases/download/%{version}/%{name}-%{version}.tar.gz Source2: %{name}.macros -BuildRequires: python3-setuptools BuildRequires: pkgconfig(python3) >= 3.5 +BuildRequires: python3-setuptools %if %{with check} -BuildRequires: locales -BuildRequires: ninja +BuildRequires: locales +BuildRequires: ninja # Various languages BuildRequires: gcc @@ -25,51 +25,51 @@ BuildRequires: gcc-gfortran BuildRequires: gcc-objc BuildRequires: gcc-objc++ BuildRequires: gnustep-base-devel -BuildRequires: mono -BuildRequires: rust BuildRequires: java-devel +BuildRequires: mono BuildRequires: pkgconfig(mono) +BuildRequires: rust # Various libs support +BuildRequires: asan-devel BuildRequires: bison +BuildRequires: boost-devel +BuildRequires: cups-devel BuildRequires: flex BuildRequires: gettext BuildRequires: git -BuildRequires: gtk-doc -BuildRequires: itstool -BuildRequires: locales-en -BuildRequires: nasm -BuildRequires: pkgconfig -BuildRequires: python3-gobject3 -BuildRequires: python3-cython -BuildRequires: qt5-linguist-tools -BuildRequires: qt5-tools -BuildRequires: texlive-epstopdf -BuildRequires: units -BuildRequires: vala -BuildRequires: vala-tools -BuildRequires: asan-devel -BuildRequires: boost-devel -BuildRequires: cups-devel BuildRequires: gmock-devel BuildRequires: gtest-devel +BuildRequires: gtk-doc +BuildRequires: itstool BuildRequires: libwmf-devel BuildRequires: llvm-devel +BuildRequires: locales-en +BuildRequires: nasm BuildRequires: pcap-devel -BuildRequires: wxgtku3.0-devel -BuildRequires: pkgconfig(sdl2) +BuildRequires: pkgconfig +BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(Qt5Gui) +BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(glib-sharp-2.0) BuildRequires: pkgconfig(gobject-introspection-1.0) BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(libgcrypt) BuildRequires: pkgconfig(protobuf) -BuildRequires: pkgconfig(Qt5Core) -BuildRequires: pkgconfig(Qt5Gui) -BuildRequires: pkgconfig(Qt5Widgets) +BuildRequires: pkgconfig(sdl2) BuildRequires: pkgconfig(vapigen) BuildRequires: pkgconfig(vulkan) BuildRequires: pkgconfig(zlib) +BuildRequires: python3-cython +BuildRequires: python3-gobject3 +BuildRequires: qt5-linguist-tools +BuildRequires: qt5-tools +BuildRequires: texlive-epstopdf +BuildRequires: units +BuildRequires: vala +BuildRequires: vala-tools +BuildRequires: wxgtku3.0-devel %endif Requires: ninja @@ -85,11 +85,11 @@ Valgrind, CCache and the like. %files %doc README.md COPYING %{_bindir}/%{name} -%{_mandir}/man1/%{name}.1.* -%{py3_puresitedir}/mesonbuild/ -%{py3_puresitedir}/%{name}-%{version}-py*.egg-info/ -%{_sys_macros_dir}/%{name}.macros %{_datadir}/polkit-1/actions/com.mesonbuild.install.policy +%{_mandir}/man1/%{name}.1.* +%{_sys_macros_dir}/%{name}.macros +%{py3_puresitedir}/%{name}-%{version}-py*.egg-info/ +%{py3_puresitedir}/mesonbuild/ #---------------------------------------------------------------------------- @@ -145,5 +145,5 @@ rm -rf "test cases/common/190 openmp" export MESON_PRINT_TEST_OUTPUT=1 export LC_ALL=UTF-8 -%__python3 run_tests.py +python3 run_tests.py %endif