Update to 0.48.0

Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>

.gitignore

@@ -47,3 +47,4 @@
 /meson-0.47.0.tar.gz
 /meson-0.47.1.tar.gz
 /meson-0.47.2.tar.gz
+/meson-0.48.0.tar.gz

0001-rpm-use-set_build_flags-skip-ci.patch

@@ -1,33 +0,0 @@
-From 48e8347b4755800287aa653a4d08b89d86bfda52 Mon Sep 17 00:00:00 2001
-From: Igor Gnatenko <i.gnatenko.brain@gmail.com>
-Date: Mon, 23 Jul 2018 19:25:30 +0200
-Subject: [PATCH 1/5] rpm: use %set_build_flags [skip ci]
-
-It has better name and should do the trick.
-
-Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
-(cherry picked from commit 99070beec4a6b1ded499405025104483534f97e4)
----
- data/macros.meson | 6 +-----
- 1 file changed, 1 insertion(+), 5 deletions(-)
-
-diff --git a/data/macros.meson b/data/macros.meson
-index 732b68d2..7be47895 100644
---- a/data/macros.meson
-+++ b/data/macros.meson
-@@ -2,11 +2,7 @@
- %__meson_wrap_mode nodownload
- 
- %meson \
--    export CFLAGS="${CFLAGS:-%__global_cflags}"       \
--    export CXXFLAGS="${CXXFLAGS:-%__global_cxxflags}" \
--    export FFLAGS="${FFLAGS:-%__global_fflags}"       \
--    export FCFLAGS="${FCFLAGS:-%__global_fcflags}"    \
--    export LDFLAGS="${LDFLAGS:-%__global_ldflags}"    \
-+    %set_build_flags \
-     %{__meson}                              \\\
-         --buildtype=plain                   \\\
-         --prefix=%{_prefix}                 \\\
--- 
-2.18.0
-

0002-rpm-use-shrink-skip-ci.patch

@@ -1,67 +0,0 @@
-From 07ed6359314c2e891c856bd0dd60e228d1e99238 Mon Sep 17 00:00:00 2001
-From: Igor Gnatenko <i.gnatenko.brain@gmail.com>
-Date: Mon, 23 Jul 2018 19:29:19 +0200
-Subject: [PATCH 2/5] =?UTF-8?q?rpm:=20use=20%{shrink=E2=80=A6}=20[skip=20c?=
- =?UTF-8?q?i]?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Make logs look better!
-
-Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
-(cherry picked from commit 88d1b8f9e7b6ff6adc4103e489f09a96e5a99743)
----
- data/macros.meson | 36 ++++++++++++++++++------------------
- 1 file changed, 18 insertions(+), 18 deletions(-)
-
-diff --git a/data/macros.meson b/data/macros.meson
-index 7be47895..a6a90525 100644
---- a/data/macros.meson
-+++ b/data/macros.meson
-@@ -3,24 +3,24 @@
- 
- %meson \
-     %set_build_flags \
--    %{__meson}                              \\\
--        --buildtype=plain                   \\\
--        --prefix=%{_prefix}                 \\\
--        --libdir=%{_libdir}                 \\\
--        --libexecdir=%{_libexecdir}         \\\
--        --bindir=%{_bindir}                 \\\
--        --sbindir=%{_sbindir}               \\\
--        --includedir=%{_includedir}         \\\
--        --datadir=%{_datadir}               \\\
--        --mandir=%{_mandir}                 \\\
--        --infodir=%{_infodir}               \\\
--        --localedir=%{_datadir}/locale      \\\
--        --sysconfdir=%{_sysconfdir}         \\\
--        --localstatedir=%{_localstatedir}   \\\
--        --sharedstatedir=%{_sharedstatedir} \\\
--        --wrap-mode=%{__meson_wrap_mode}    \\\
--        %{_vpath_srcdir} %{_vpath_builddir} \\\
--        %{nil}
-+    %{shrink:%{__meson} \
-+        --buildtype=plain \
-+        --prefix=%{_prefix} \
-+        --libdir=%{_libdir} \
-+        --libexecdir=%{_libexecdir} \
-+        --bindir=%{_bindir} \
-+        --sbindir=%{_sbindir} \
-+        --includedir=%{_includedir} \
-+        --datadir=%{_datadir} \
-+        --mandir=%{_mandir} \
-+        --infodir=%{_infodir} \
-+        --localedir=%{_datadir}/locale \
-+        --sysconfdir=%{_sysconfdir} \
-+        --localstatedir=%{_localstatedir} \
-+        --sharedstatedir=%{_sharedstatedir} \
-+        --wrap-mode=%{__meson_wrap_mode} \
-+        %{_vpath_srcdir} %{_vpath_builddir} \
-+	%{nil}}
- 
- %meson_build \
-     %ninja_build -C %{_vpath_builddir}
--- 
-2.18.0
-

0003-rpm-pass-auto-features-enabled-skip-ci.patch

@@ -1,35 +0,0 @@
-From 5791529fdfce3e962a2d857c807e082e051c4e1d Mon Sep 17 00:00:00 2001
-From: Igor Gnatenko <i.gnatenko.brain@gmail.com>
-Date: Mon, 23 Jul 2018 19:24:33 +0200
-Subject: [PATCH 3/5] rpm: pass --auto-features=enabled [skip ci]
-
-We really want to be explicit.
-
-Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
-(cherry picked from commit 1515fca2d9d4dcc8c9c98689421e69517444c05e)
----
- data/macros.meson | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/data/macros.meson b/data/macros.meson
-index a6a90525..4a8a3ca4 100644
---- a/data/macros.meson
-+++ b/data/macros.meson
-@@ -1,5 +1,6 @@
- %__meson %{_bindir}/meson
- %__meson_wrap_mode nodownload
-+%__meson_auto_features enabled
- 
- %meson \
-     %set_build_flags \
-@@ -19,6 +20,7 @@
-         --localstatedir=%{_localstatedir} \
-         --sharedstatedir=%{_sharedstatedir} \
-         --wrap-mode=%{__meson_wrap_mode} \
-+        --auto-features=%{__meson_auto_features} \
-         %{_vpath_srcdir} %{_vpath_builddir} \
- 	%{nil}}
- 
--- 
-2.18.0
-

meson.spec

@@ -3,7 +3,7 @@
 %bcond_with check
 
 Name:           meson
-Version:        0.47.2
+Version:        0.48.0
 Release:        1%{?dist}
 Summary:        High productivity build system
 
@@ -11,10 +11,6 @@ License:        ASL 2.0
 URL:            http://mesonbuild.com/
 Source0:        https://github.com/mesonbuild/meson/archive/%{version}/%{name}-%{version}.tar.gz
 
-Patch0001:      0001-rpm-use-set_build_flags-skip-ci.patch
-Patch0002:      0002-rpm-use-shrink-skip-ci.patch
-Patch0003:      0003-rpm-pass-auto-features-enabled-skip-ci.patch
-
 BuildArch:      noarch
 Obsoletes:      %{name}-gui < 0.31.0-3
 
@@ -112,6 +108,9 @@ export MESON_PRINT_TEST_OUTPUT=1
 %{_datadir}/polkit-1/actions/com.mesonbuild.install.policy
 
 %changelog
+* Tue Sep 25 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.48.0-1
+- Update to 0.48.0
+
 * Sat Aug 25 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.47.2-1
 - Update to 0.47.2
 

sources

@@ -1 +1 @@
-SHA512 (meson-0.47.2.tar.gz) = 3fe350c785406fad74232e477f8972b7ab74871bcb7d93e6f08640305aeb15172065c6a63300c2fe2c96ce877f08e95a15f829bf65a9ca0293a2f70ad2c799ef
+SHA512 (meson-0.48.0.tar.gz) = 3144ad011d5d666ee9c162ad789dc5cbded3292d24d92833cb9f92aabca98033a93b4d7de3b22a86a10ac751f397bc1ad489e03221f8550a30c428624e5545f5