From 31cda5aeb99c2e1871662ae50e8ea938c2ba5c31c7e92d59030e76274ba079bb Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Thu, 29 Jun 2017 10:19:32 +0000
Subject: [PATCH] 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