From 56470d5531332990f2aaaa5acf2a1dd482eab57faf56f52fdd2a32d097eb589f Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Wed, 11 Oct 2017 20:40:48 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/meson?expand=0&rev=64 --- meson-testsuite.changes | 6 ++++++ meson-testsuite.spec | 19 ++++++++++++++----- meson.changes | 6 ++++++ meson.spec | 19 ++++++++++++++----- 4 files changed, 40 insertions(+), 10 deletions(-) diff --git a/meson-testsuite.changes b/meson-testsuite.changes index 9e77eab..550d19e 100644 --- a/meson-testsuite.changes +++ b/meson-testsuite.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Oct 11 15:43:16 UTC 2017 - sor.alexei@meowr.ru + +- Don't use obsolete boost-devel for openSUSE Leap 15.0 and newer + (boo#1062785). + ------------------------------------------------------------------- Mon Oct 2 14:53:40 CEST 2017 - jdelvare@suse.com diff --git a/meson-testsuite.spec b/meson-testsuite.spec index dad1481..8f65d28 100644 --- a/meson-testsuite.spec +++ b/meson-testsuite.spec @@ -20,7 +20,7 @@ %if %{testsuite} %define name_ext -testsuite %else -%define name_ext %nil +%define name_ext %{nil} %endif %define _name mesonbuild Name: meson%{name_ext} @@ -37,13 +37,13 @@ Source2: meson.keyring Patch0: meson-suse-ify-macros.patch # PATCH-FIX-OPENSUSE meson-fix-gcc48.patch sor.alexei@meowr.ru -- Fix GCC 4.8 handling for openSUSE Leap 42.x. Patch1: meson-fix-gcc48.patch -# PATCH-FIX-OPENSUSE meson-test-installed-bin.patch dimstar@opensuse.org -- We want the test suite to run against /usr/bin/meson coming from our meson package +# PATCH-FIX-OPENSUSE meson-test-installed-bin.patch dimstar@opensuse.org -- We want the test suite to run against /usr/bin/meson coming from our meson package. Patch100: meson-test-installed-bin.patch BuildRequires: python3 >= 3.4 BuildArch: noarch %if %{testsuite} BuildRequires: bison -BuildRequires: boost-devel +BuildRequires: cups-devel BuildRequires: flex BuildRequires: gcc-c++ BuildRequires: gcc-fortran @@ -57,9 +57,10 @@ BuildRequires: gtk-doc BuildRequires: itstool BuildRequires: libpcap-devel BuildRequires: llvm-devel -BuildRequires: meson +BuildRequires: meson >= %{version} BuildRequires: ncurses-devel BuildRequires: ninja +BuildRequires: openmpi-devel BuildRequires: pkgconfig BuildRequires: python3-devel BuildRequires: python3-gobject @@ -74,6 +75,14 @@ BuildRequires: pkgconfig(gobject-introspection-1.0) BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(sdl2) BuildRequires: pkgconfig(zlib) +%if 0%{?suse_version} > 1320 +BuildRequires: libboost_log-devel +BuildRequires: libboost_system-devel +BuildRequires: libboost_test-devel +BuildRequires: libboost_thread-devel +%else +BuildRequires: boost-devel +%endif %else Requires: ninja # meson-gui was last used in openSUSE Leap 42.1. @@ -90,7 +99,7 @@ Java, Rust. Build definitions are written in a non-turing complete Domain Specific Language. %package vim -%{!?vim_data_dir:%global vim_data_dir %_datadir/vim} +%{!?vim_data_dir:%global vim_data_dir %{_datadir}/vim} Summary: Vim support for meson.build files Group: Productivity/Text/Editors Requires: vim diff --git a/meson.changes b/meson.changes index 9e77eab..550d19e 100644 --- a/meson.changes +++ b/meson.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Oct 11 15:43:16 UTC 2017 - sor.alexei@meowr.ru + +- Don't use obsolete boost-devel for openSUSE Leap 15.0 and newer + (boo#1062785). + ------------------------------------------------------------------- Mon Oct 2 14:53:40 CEST 2017 - jdelvare@suse.com diff --git a/meson.spec b/meson.spec index beec17a..793001f 100644 --- a/meson.spec +++ b/meson.spec @@ -20,7 +20,7 @@ %if %{testsuite} %define name_ext -testsuite %else -%define name_ext %nil +%define name_ext %{nil} %endif %define _name mesonbuild Name: meson%{name_ext} @@ -37,13 +37,13 @@ Source2: meson.keyring Patch0: meson-suse-ify-macros.patch # PATCH-FIX-OPENSUSE meson-fix-gcc48.patch sor.alexei@meowr.ru -- Fix GCC 4.8 handling for openSUSE Leap 42.x. Patch1: meson-fix-gcc48.patch -# PATCH-FIX-OPENSUSE meson-test-installed-bin.patch dimstar@opensuse.org -- We want the test suite to run against /usr/bin/meson coming from our meson package +# PATCH-FIX-OPENSUSE meson-test-installed-bin.patch dimstar@opensuse.org -- We want the test suite to run against /usr/bin/meson coming from our meson package. Patch100: meson-test-installed-bin.patch BuildRequires: python3 >= 3.4 BuildArch: noarch %if %{testsuite} BuildRequires: bison -BuildRequires: boost-devel +BuildRequires: cups-devel BuildRequires: flex BuildRequires: gcc-c++ BuildRequires: gcc-fortran @@ -57,9 +57,10 @@ BuildRequires: gtk-doc BuildRequires: itstool BuildRequires: libpcap-devel BuildRequires: llvm-devel -BuildRequires: meson +BuildRequires: meson >= %{version} BuildRequires: ncurses-devel BuildRequires: ninja +BuildRequires: openmpi-devel BuildRequires: pkgconfig BuildRequires: python3-devel BuildRequires: python3-gobject @@ -74,6 +75,14 @@ BuildRequires: pkgconfig(gobject-introspection-1.0) BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(sdl2) BuildRequires: pkgconfig(zlib) +%if 0%{?suse_version} > 1320 +BuildRequires: libboost_log-devel +BuildRequires: libboost_system-devel +BuildRequires: libboost_test-devel +BuildRequires: libboost_thread-devel +%else +BuildRequires: boost-devel +%endif %else Requires: ninja # meson-gui was last used in openSUSE Leap 42.1. @@ -90,7 +99,7 @@ Java, Rust. Build definitions are written in a non-turing complete Domain Specific Language. %package vim -%{!?vim_data_dir:%global vim_data_dir %_datadir/vim} +%{!?vim_data_dir:%global vim_data_dir %{_datadir}/vim} Summary: Vim support for meson.build files Group: Productivity/Text/Editors Requires: vim