From 750d89d245699cabca29334f3195fca2b4aa3e417a2adc8af21fd5fddc6aeade Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Fri, 27 Apr 2018 07:22:12 +0000
Subject: [PATCH] Accepting request 601829 from devel:tools:building

Revert last submission

OBS-URL: https://build.opensuse.org/request/show/601829
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/meson?expand=0&rev=95
---
 meson-suse-ify-macros.patch | 14 ++++++--------
 meson-testsuite.changes     |  6 ------
 meson.changes               |  6 ------
 3 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/meson-suse-ify-macros.patch b/meson-suse-ify-macros.patch
index 6984ae2..30fa336 100644
--- a/meson-suse-ify-macros.patch
+++ b/meson-suse-ify-macros.patch
@@ -1,7 +1,8 @@
-diff -ru meson-0.46.0.orig/data/macros.meson meson-0.46.0/data/macros.meson
---- meson-0.46.0.orig/data/macros.meson	2018-02-21 20:11:51.000000000 +0100
-+++ meson-0.46.0/data/macros.meson	2018-04-27 09:04:40.132129796 +0200
-@@ -1,14 +1,17 @@
+Index: meson-0.45.0/data/macros.meson
+===================================================================
+--- meson-0.45.0.orig/data/macros.meson
++++ meson-0.45.0/data/macros.meson
+@@ -1,12 +1,14 @@
  %__meson %{_bindir}/meson
  %__meson_wrap_mode nodownload
 +%_vpath_srcdir .
@@ -20,11 +21,8 @@ diff -ru meson-0.46.0.orig/data/macros.meson meson-0.46.0/data/macros.meson
 +    export FCFLAGS="${FCFLAGS:-%optflags}"   \
      %{__meson}                              \\\
          --buildtype=plain                   \\\
-+        --Dstrip=false                      \\\
          --prefix=%{_prefix}                 \\\
-         --libdir=%{_libdir}                 \\\
-         --libexecdir=%{_libexecdir}         \\\
-@@ -27,12 +30,15 @@
+@@ -27,12 +29,15 @@
          %{nil}
  
  %meson_build \
diff --git a/meson-testsuite.changes b/meson-testsuite.changes
index 382ed0b..80fdef2 100644
--- a/meson-testsuite.changes
+++ b/meson-testsuite.changes
@@ -1,9 +1,3 @@
--------------------------------------------------------------------
-Fri Apr 27 07:06:31 UTC 2018 - 9+suse@cirno.systems
-
-- Change meson-suse-ify-macros.patch: Disable stripping to make
-  debuginfo packages work. 
-
 -------------------------------------------------------------------
 Wed Apr 25 18:53:17 UTC 2018 - sor.alexei@meowr.ru
 
diff --git a/meson.changes b/meson.changes
index 382ed0b..80fdef2 100644
--- a/meson.changes
+++ b/meson.changes
@@ -1,9 +1,3 @@
--------------------------------------------------------------------
-Fri Apr 27 07:06:31 UTC 2018 - 9+suse@cirno.systems
-
-- Change meson-suse-ify-macros.patch: Disable stripping to make
-  debuginfo packages work. 
-
 -------------------------------------------------------------------
 Wed Apr 25 18:53:17 UTC 2018 - sor.alexei@meowr.ru