Accepting request 863652 from GNOME:Next

OBS-URL: https://build.opensuse.org/request/show/863652
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/meson?expand=0&rev=197

meson-0.56.1.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5780725304eaa28aac5e7de99d2d8d045112fbc10cf9f4181498b877de0ecf28
-size 1794519

meson-0.56.1.tar.gz.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEEGeLW2bRtjapiiPh3wk5jG6ux/nAFAl/1m1sACgkQwk5jG6ux
-/nC2NA/+JM1k2kFtwOG43V9/cLc0LVBLkXWfBn3HiUikRN1Zw2OFAibEbPjnb/X1
-U6cOwZcE5nEqlzw/arItyKBeDWKG4VKsTPzPhTcwjZVo+Z6jSlc8WoYqAkm4Hoc2
-zAL+liX9dcrWImnYtYW61vIL/qERzuklYpCG6VXwRTa7R5ZW8HxlvJf0KO1ExoAk
-CI5a3u6o31lmRz771IRW664riHNNMXURguJ6RfMmVlhwxGyVI0Wvfpp34Zlo/Gza
-mxOwj7rI/H+ccf885OM5Hkv5Ctyd4GPpMmDrJT9sB7WUFqOuI12Si0P/UqBqP6Dk
-OEFWWdxXJTX+yFMzuSgkPZJW2Jy5zcdRsVUqxzF3uQfcN54OUzPKYBauc+JOzDrp
-Nli1WmnC+Exri4wCQHAatf+nXiXfYthX4CFNe8DTkt7TuCyYfzHGGttly9L9+JJY
-hztnRwD/jkzfYJMqNQF6YlYrU9/MHmH4lyd2QnBldzg+8yyMGWFYTurCDXSWKLaW
-XdAF5qtZehkABIbZVnemqhr5lATV7RkQ+fKyKL3byy946gLMp5iqPhmflNIDsevN
-hyx4cj7fovyFyyHhHhzMTJYuAyKBxYPr+mxMvN7ByKhGXCkNDLzAHMsgmTgTBI/z
-k94AdaBc70Nt832xrJwHRVtXQDUrxB0sWGa5n04wfy2lvsRS9fQ=
-=gT27
------END PGP SIGNATURE-----

meson-0.56.2.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3cb8bdb91383f7f8da642f916e4c44066a29262caa499341e2880f010edb87f4
+size 1794847

meson-0.56.2.tar.gz.asc

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEGeLW2bRtjapiiPh3wk5jG6ux/nAFAl/6/DsACgkQwk5jG6ux
+/nBTtg/+LqbKrBZkZAi6CYRZFsqUKXjFyyWjzc/rNbrG3UPEw3IaUz9lSW/CtK8k
+UeK6xG5HNCV4vCxkZUrts28W+RETU1Pfi5Tjw1v8VfO9KMRbpDmqJbJwWcMsDGCc
+7bFw5VsKZsyGj9ksV4Xr7LsjIZnXWvlF0+dUpheNN4f3rI4/aOgeeERKl6U7KvHX
+pmvWbhyco1XGlC2Q6hfmqEbChKGcqHtMcK3PgG6S2yCv9bKlVIcm0Drp7U/wNIwx
+OFf/K8oIIfMBSKNHZBpbjjoy7neOB7NLalZDaroFRDCMQgqYpT/9RbNLeEEEOgIb
+KHJ2YrP5m6EP2LiJ7mTnmf8UF05CwMAMVtBl+ozkFwcPfkJrDtaRV+3rcCdgsqWa
+f8u2yCMpMFm/fpcqH4aw31OuotxXZ/DxF5dAci6+LWugc5r8R7BlwJclkKTVK9M5
+5CXVdN7a8YWwqKidyPyKmNcoF37U37IKfKLIETGkwp5LS/RiLm8z9p2qp9Ydglj9
+Cpdl1QTwGODbfQJUi9ufme8W2vd66r5eIUVeE/l7BN8jNSf3doF+p0+z+5/fk5XA
+eWtKmd8Mjvd2MMMJy4x0u2g6WmXxi9lWP/aFAGo+sdofDvDtPhvtC5qpiKLyCOJT
+BlQp5CD2O1JWoeIFpEmAaPKku032R5UihYHGxyhCnyLXdPb3fLs=
+=GZju
+-----END PGP SIGNATURE-----

meson-suse-ify-macros.patch

@@ -1,46 +0,0 @@
---- a/data/macros.meson
-+++ b/data/macros.meson
-@@ -1,9 +1,15 @@
- %__meson %{_bindir}/meson
- %__meson_wrap_mode nodownload
- %__meson_auto_features enabled
-+%_vpath_srcdir .
-+%_vpath_builddir build
- 
- %meson \
--    %set_build_flags \
-+    export LANG=C.UTF-8                      \
-+    export CFLAGS="${CFLAGS:-%optflags}"     \
-+    export CXXFLAGS="${CXXFLAGS:-%optflags}" \
-+    export FFLAGS="${FFLAGS:-%optflags}"     \
-+    export FCFLAGS="${FCFLAGS:-%optflags}"   \
-     %{shrink:%{__meson} \
-         --buildtype=plain \
-         --prefix=%{_prefix} \
-@@ -25,21 +31,24 @@
-         %{nil}}
- 
- %meson_build \
-+    export LANG=C.UTF-8 \
-     %{shrink:%{__meson} compile \
-         -C %{_vpath_builddir} \
--        -j %{_smp_build_ncpus} \
-+        %{?_smp_mflags} \
-         --verbose \
-         %{nil}}
- 
- %meson_install \
-+    export LANG=C.UTF-8                      \
-     %{shrink:DESTDIR=%{buildroot} %{__meson} install \
-         -C %{_vpath_builddir} \
-         --no-rebuild \
-         %{nil}}
- 
- %meson_test \
-+    export LANG=C.UTF-8                      \
-     %{shrink:%{__meson} test \
-         -C %{_vpath_builddir} \
--        --num-processes %{_smp_build_ncpus} \
-+        %{?jobs:--num-processes %{jobs}} \
-         --print-errorlogs \
-         %{nil}}

meson.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Sat Jan 16 13:05:47 UTC 2021 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Update to version 0.56.2:
+  + This release fixes a Python 3.5 compat issue.
+
+-------------------------------------------------------------------
+Thu Jan  7 13:00:11 UTC 2021 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Drop meson-suse-ify-macros.patch: No longer needed.
+
 -------------------------------------------------------------------
 Wed Jan  6 11:32:14 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>
 

meson.spec

@@ -28,7 +28,7 @@
 %{!?vim_data_dir:%global vim_data_dir %{_datadir}/vim}
 %bcond_with     setuptools
 Name:           meson%{name_ext}
-Version:        0.56.1
+Version:        0.56.2
 Release:        0
 Summary:        Python-based build system
 License:        Apache-2.0
@@ -37,8 +37,6 @@ URL:            http://mesonbuild.com/
 Source:         https://github.com/%{_name}/meson/releases/download/%{version}/meson-%{version}.tar.gz
 Source1:        https://github.com/%{_name}/meson/releases/download/%{version}/meson-%{version}.tar.gz.asc
 Source2:        meson.keyring
-# PATCH-FIX-OPENSUSE meson-suse-ify-macros.patch dimstar@opensuse.org -- Make the macros non-RedHat specific: so far there are no separate {C,CXX,F}FLAGS.
-Patch0:         meson-suse-ify-macros.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.
 Patch1:         meson-test-installed-bin.patch
 # PATCH-FEATURE-OPENSUSE meson-distutils.patch tchvatal@suse.com -- build and install using distutils instead of full setuptools
@@ -157,7 +155,6 @@ This package provides support for meson.build files in Vim.
 
 %prep
 %setup -q -n meson-%{version}
-%patch0 -p1
 %patch1 -p1
 %if !%{with setuptools}
 %patch2 -p1