From fbbd9f4191c11e2b1b643767255fa3927641cc096523e8bd3cd7642ab342f2de Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 29 Jun 2017 10:18:00 +0000 Subject: [PATCH 1/3] Accepting request 506831 from home:RZLourenco Adds a vim subpackage that adds Meson support to Vim. OBS-URL: https://build.opensuse.org/request/show/506831 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/meson?expand=0&rev=49 --- meson.changes | 5 +++++ meson.spec | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+) diff --git a/meson.changes b/meson.changes index 93e989c..c4744f1 100644 --- a/meson.changes +++ b/meson.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jun 27 14:19:46 UTC 2017 - rodrigo.z.lourenco@tecnico.ulisboa.pt + +- Add a vim subpackage to add Meson support to Vim. + ------------------------------------------------------------------- Fri Jun 23 21:47:40 UTC 2017 - dimstar@opensuse.org diff --git a/meson.spec b/meson.spec index 4856428..1948bb9 100644 --- a/meson.spec +++ b/meson.spec @@ -74,6 +74,7 @@ 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} @@ -89,6 +90,24 @@ CCache and the like. Supported languages include C, C++, Fortran, Java, Rust. Build definitions are written in a non-turing complete Domain Specific Language. +%package 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} + +%description vim +Meson is a build system designed to optimise programmer productivity. +It aims to do this by providing support for software development +tools and practices, such as unit tests, coverage reports, Valgrind, +CCache and the like. Supported languages include C, C++, Fortran, +Java, Rust. Build definitions are written in a non-turing complete +Domain Specific Language. + +This package provides support for meson.build files in Vim. + %prep %setup -q -n meson-%{version} %patch0 -p1 @@ -116,6 +135,13 @@ python3 setup.py install \ install -Dpm 0644 data/macros.meson \ %{buildroot}%{_rpmconfigdir}/macros.d/macros.meson + +install -Dpm 0644 syntax-highlighting/vim/ftdetect/meson.vim \ + -t %{buildroot}%{vim_data_dir}/site/ftdetect +install -Dpm 0644 syntax-highlighting/vim/indent/meson.vim \ + -t %{buildroot}%{vim_data_dir}/site/indent +install -Dpm 0644 syntax-highlighting/vim/syntax/meson.vim \ + -t %{buildroot}%{vim_data_dir}/site/syntax %endif %if %{testsuite} @@ -128,6 +154,7 @@ python3 run_tests.py %files %defattr(-,root,root) + %doc contributing.txt COPYING %if !%{testsuite} %{_bindir}/meson @@ -145,4 +172,19 @@ python3 run_tests.py %{_mandir}/man1/wraptool.1%{?ext_man} %endif +%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 +%dir %{vim_data_dir}/site/indent +%dir %{vim_data_dir}/site/syntax +%{vim_data_dir}/site/ftdetect/meson.vim +%{vim_data_dir}/site/indent/meson.vim +%{vim_data_dir}/site/syntax/meson.vim +%endif + %changelog From 31cda5aeb99c2e1871662ae50e8ea938c2ba5c31c7e92d59030e76274ba079bb Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 29 Jun 2017 10:19:32 +0000 Subject: [PATCH 2/3] Minor tweaks - do not produce -vim subpackage for the test suite OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/meson?expand=0&rev=50 --- meson-testsuite.spec | 4 +--- meson.spec | 14 +++++--------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/meson-testsuite.spec b/meson-testsuite.spec index 930c79b..fc61335 100644 --- a/meson-testsuite.spec +++ b/meson-testsuite.spec @@ -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. diff --git a/meson.spec b/meson.spec index 1948bb9..6f806d5 100644 --- a/meson.spec +++ b/meson.spec @@ -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 From 6732465961ca8e4fdb6655440ee3cfc612b3cde8437d25a431e87980fd2fcea0 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 29 Jun 2017 10:19:51 +0000 Subject: [PATCH 3/3] - Add a vim subpackage to add Meson support to Vim. OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/meson?expand=0&rev=51 --- meson-testsuite.changes | 5 +++++ meson-testsuite.spec | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+) diff --git a/meson-testsuite.changes b/meson-testsuite.changes index 93e989c..c4744f1 100644 --- a/meson-testsuite.changes +++ b/meson-testsuite.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jun 27 14:19:46 UTC 2017 - rodrigo.z.lourenco@tecnico.ulisboa.pt + +- Add a vim subpackage to add Meson support to Vim. + ------------------------------------------------------------------- Fri Jun 23 21:47:40 UTC 2017 - dimstar@opensuse.org diff --git a/meson-testsuite.spec b/meson-testsuite.spec index fc61335..8d60edf 100644 --- a/meson-testsuite.spec +++ b/meson-testsuite.spec @@ -87,6 +87,24 @@ CCache and the like. Supported languages include C, C++, Fortran, 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 +Requires: vim +Supplements: packageand(vim:%{name}) +BuildArch: noarch + +%description vim +Meson is a build system designed to optimise programmer productivity. +It aims to do this by providing support for software development +tools and practices, such as unit tests, coverage reports, Valgrind, +CCache and the like. Supported languages include C, C++, Fortran, +Java, Rust. Build definitions are written in a non-turing complete +Domain Specific Language. + +This package provides support for meson.build files in Vim. + %prep %setup -q -n meson-%{version} %patch0 -p1 @@ -114,6 +132,13 @@ python3 setup.py install \ install -Dpm 0644 data/macros.meson \ %{buildroot}%{_rpmconfigdir}/macros.d/macros.meson + +install -Dpm 0644 syntax-highlighting/vim/ftdetect/meson.vim \ + -t %{buildroot}%{vim_data_dir}/site/ftdetect +install -Dpm 0644 syntax-highlighting/vim/indent/meson.vim \ + -t %{buildroot}%{vim_data_dir}/site/indent +install -Dpm 0644 syntax-highlighting/vim/syntax/meson.vim \ + -t %{buildroot}%{vim_data_dir}/site/syntax %endif %if %{testsuite} @@ -126,6 +151,7 @@ python3 run_tests.py %files %defattr(-,root,root) + %doc contributing.txt COPYING %if !%{testsuite} %{_bindir}/meson @@ -143,4 +169,18 @@ python3 run_tests.py %{_mandir}/man1/wraptool.1%{?ext_man} %endif +%if !%{testsuite} +%files vim +%defattr(-,root,root) +%doc syntax-highlighting/vim/README +%dir %{vim_data_dir} +%dir %{vim_data_dir}/site +%dir %{vim_data_dir}/site/ftdetect +%dir %{vim_data_dir}/site/indent +%dir %{vim_data_dir}/site/syntax +%{vim_data_dir}/site/ftdetect/meson.vim +%{vim_data_dir}/site/indent/meson.vim +%{vim_data_dir}/site/syntax/meson.vim +%endif + %changelog