From a04fc6dd9c2847ff0c8a2bb9357ceb664f7d6a4d67a0e22e54edf285ce17c10d Mon Sep 17 00:00:00 2001
From: Alexei Sorokin <sor.alexei@meowr.ru>
Date: Mon, 18 Sep 2017 13:06:47 +0000
Subject: [PATCH] Accepting request 527002 from GNOME:Next

- do not use a variable in the Name: tag: SLE's checkin scripts
  still can't handle that.

- Rebase meson-fix-gcc48.patch (boo#1057701).

- do not use a variable in the Name: tag: SLE's checkin scripts
  still can't handle that.

OBS-URL: https://build.opensuse.org/request/show/527002
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/meson?expand=0&rev=60
---
 meson-testsuite.changes | 11 +++++++++++
 meson-testsuite.spec    | 16 ++++++++--------
 meson.changes           |  6 ++++++
 meson.spec              | 16 ++++++++--------
 4 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/meson-testsuite.changes b/meson-testsuite.changes
index 037fbb6..eb2e868 100644
--- a/meson-testsuite.changes
+++ b/meson-testsuite.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Mon Sep 18 11:16:01 UTC 2017 - dimstar@opensuse.org
+
+- do not use a variable in the Name: tag: SLE's checkin scripts
+  still can't handle that.
+
+-------------------------------------------------------------------
+Fri Sep  8 12:22:38 UTC 2017 - sor.alexei@meowr.ru
+
+- Rebase meson-fix-gcc48.patch (boo#1057701).
+
 -------------------------------------------------------------------
 Tue Aug 15 11:00:02 UTC 2017 - dimstar@opensuse.org
 
diff --git a/meson-testsuite.spec b/meson-testsuite.spec
index f8654d5..3c44eb9 100644
--- a/meson-testsuite.spec
+++ b/meson-testsuite.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,13 @@
 
 
 %define testsuite 1
-%if %{testsuite}
-%define name_ext -testsuite
-%else
-%define name_ext %nil
-%endif
 %define _name   mesonbuild
-Name:           meson%{name_ext}
+
+%if ! 0%{?testsuite}
+Name:           meson
+%else
+Name:           meson-testsuite
+%endif
 Version:        0.42.0
 Release:        0
 Summary:        Python-based build system
@@ -90,7 +90,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 c01bb74..eb2e868 100644
--- a/meson.changes
+++ b/meson.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Sep 18 11:16:01 UTC 2017 - dimstar@opensuse.org
+
+- do not use a variable in the Name: tag: SLE's checkin scripts
+  still can't handle that.
+
 -------------------------------------------------------------------
 Fri Sep  8 12:22:38 UTC 2017 - sor.alexei@meowr.ru
 
diff --git a/meson.spec b/meson.spec
index 929f53d..d1d9e90 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,13 @@
 
 
 %define testsuite 0
-%if %{testsuite}
-%define name_ext -testsuite
-%else
-%define name_ext %nil
-%endif
 %define _name   mesonbuild
-Name:           meson%{name_ext}
+
+%if ! 0%{?testsuite}
+Name:           meson
+%else
+Name:           meson-testsuite
+%endif
 Version:        0.42.0
 Release:        0
 Summary:        Python-based build system
@@ -90,7 +90,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