pool/meson
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor tweaks - do not produce -vim subpackage for the test suite

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/meson?expand=0&rev=50
This commit is contained in:
Dominique Leuenberger 2017-06-29 10:19:32 +00:00 committed by Git OBS Bridge
parent fbbd9f4191
commit 31cda5aeb9
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meson-testsuite.spec
View File

@ -17,13 +17,11 @@
%define testsuite 1
%if %{testsuite}
%define name_ext -testsuite
%else
%define name_ext %nil
%endif
%define _name mesonbuild
Name: meson%{name_ext}
Version: 0.41.1
@ -42,6 +40,7 @@ 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
Patch100: meson-test-installed-bin.patch
BuildRequires: python3 >= 3.4
BuildArch: noarch
%if %{testsuite}
BuildRequires: bison
BuildRequires: boost-devel
@ -79,7 +78,6 @@ Requires: ninja
Provides: meson-gui = %{version}
Obsoletes: meson-gui < %{version}
%endif
BuildArch: noarch
%description
Meson is a build system designed to optimise programmer productivity.

14
meson.spec
View File

@ -1,5 +1,5 @@
#
# spec file for package meson-testsuite
# spec file for package meson
#
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
@ -17,13 +17,11 @@
%define testsuite 0
%if %{testsuite}
%define name_ext -testsuite
%else
%define name_ext %nil
%endif
%define _name mesonbuild
Name: meson%{name_ext}
Version: 0.41.1
@ -42,6 +40,7 @@ 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
Patch100: meson-test-installed-bin.patch
BuildRequires: python3 >= 3.4
BuildArch: noarch
%if %{testsuite}
BuildRequires: bison
BuildRequires: boost-devel
@ -74,13 +73,11 @@ BuildRequires: pkgconfig(gtk+-3.0)
BuildRequires: pkgconfig(sdl2)
BuildRequires: pkgconfig(zlib)
%else
# To own /usr/share/vim
Requires: ninja
# meson-gui was last used in openSUSE Leap 42.1.
Provides: meson-gui = %{version}
Obsoletes: meson-gui < %{version}
%endif
BuildArch: noarch
%description
Meson is a build system designed to optimise programmer productivity.
@ -91,12 +88,12 @@ 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}
Summary: Vim support for meson.build files
Group: Productivity/Text/Editors
BuildArch: noarch
Requires: vim
Supplements: packageand(vim:%{name})
%{!?vim_data_dir:%global vim_data_dir %_datadir/vim}
BuildArch: noarch
%description vim
Meson is a build system designed to optimise programmer productivity.
@ -172,11 +169,10 @@ python3 run_tests.py
%{_mandir}/man1/wraptool.1%{?ext_man}
%endif
%if !%{testsuite}
%files vim
%defattr(-,root,root)
%doc syntax-highlighting/vim/README
%if !%{testsuite}
%dir %{vim_data_dir}
%dir %{vim_data_dir}/site
%dir %{vim_data_dir}/site/ftdetect