meson update to 0.49.2

Signed-off-by: basebuilder_pel7x64builder0 <basebuilder@powerel.org>

SPECS/meson.spec

@@ -1,24 +1,76 @@
 %global libname mesonbuild
 
+%bcond_with check
+
 Name:           meson
-Version:        0.47.2
+Version:        0.49.2
 Release:        1%{?dist}
 Summary:        High productivity build system
 
 License:        ASL 2.0
 URL:            http://mesonbuild.com/
 Source0:        https://github.com/mesonbuild/meson/archive/%{version}/%{name}-%{version}.tar.gz
-Patch0001:      0001-rpm-use-good-old-optflags.patch
-Patch0002:      0002-rpm-pass-auto-features-enabled-skip-ci.patch
 
 BuildArch:      noarch
 Obsoletes:      %{name}-gui < 0.31.0-3
 
-BuildRequires:  python3-devel
-BuildRequires:  python3-setuptools
-BuildRequires:  python3-rpm-macros
+BuildRequires:  python%{python3_pkgversion}-devel
+BuildRequires:  python%{python3_pkgversion}-setuptools
+%if %{with check}
 BuildRequires:  ninja-build
+# Various languages
+BuildRequires:  gcc
+BuildRequires:  libasan
+BuildRequires:  gcc-c++
+BuildRequires:  gcc-gfortran
+BuildRequires:  gcc-objc
+BuildRequires:  gcc-objc++
+BuildRequires:  java-devel
+BuildRequires:  mono-core mono-devel
+BuildRequires:  rust
+# No ldc as of RHEL7 and on non-ldc arches
+%if ! 0%{?rhel} || 0%{?rhel} > 7
+# Since the build is noarch, we can't use %%ifarch
+#%%ifarch %%{ldc_arches}
+#BuildRequires:  ldc
+#%%endif
+%endif
+# Various libs support
+BuildRequires:  boost-devel
+BuildRequires:  gtest-devel
+BuildRequires:  gmock-devel
+BuildRequires:  qt5-qtbase-devel
+BuildRequires:  vala
+# In recent versions it's merged into vala
+%if (0%{?fedora} && 0%{?fedora} <= 24) || (0%{?rhel} && 0%{?rhel} <= 7)
+BuildRequires:  vala-tools
+%endif
+BuildRequires:  wxGTK3-devel
+BuildRequires:  flex
+BuildRequires:  bison
+BuildRequires:  gettext
+BuildRequires:  gnustep-base-devel
+BuildRequires:  %{_bindir}/gnustep-config
+BuildRequires:  git-core
+BuildRequires:  pkgconfig(protobuf)
+BuildRequires:  pkgconfig(glib-2.0)
+BuildRequires:  pkgconfig(glib-sharp-2.0)
+BuildRequires:  pkgconfig(gobject-introspection-1.0)
+%if ! 0%{?rhel} || 0%{?rhel} > 7
+BuildRequires:  python3-gobject-base
+%endif
+BuildRequires:  gtk-doc
+BuildRequires:  itstool
+BuildRequires:  pkgconfig(zlib)
+BuildRequires:  python%{python3_pkgversion}-Cython
+BuildRequires:  pkgconfig(sdl2)
+BuildRequires:  %{_bindir}/pcap-config
+BuildRequires:  pkgconfig(vulkan)
+BuildRequires:  llvm-devel
+BuildRequires:  cups-devel
+%endif
 Requires:       ninja-build
+Requires:       python3-devel
 
 %description
 Meson is a build system designed to optimize programmer
@@ -29,54 +81,67 @@ unit tests, coverage reports, Valgrind, CCache and the like.
 %prep
 %autosetup -p1
 find -type f -name '*.py' -executable -exec sed -i -e '1s|.*|#!%{__python3}|' {} ';'
-# Macro should not change when we are redefining bindir
-sed -i -e "/^%%__meson /s| .*$| %{_bindir}/%{name}|" data/macros.%{name}
+# Remove MPI tests for now because it is complicated to run
+rm -rf "test cases/frameworks/17 mpi"
 
 %build
-%{__python3} setup.py build
+%py3_build
 
 %install
-%{__python3} setup.py install --root %{buildroot} --optimize 2
-install -Dpm0644 data/macros.%{name} %{buildroot}/usr/lib/rpm/macros.d/macros.%{name}
+%py3_install
+install -Dpm0644 data/macros.%{name} %{buildroot}/usr/lib//rpm/macros.d/macros.%{name}
+
+%if %{with check}
+%check
+export MESON_PRINT_TEST_OUTPUT=1
+%{__python3} ./run_tests.py %{?rhel:|| :}
+%endif
 
 %files
 %license COPYING
 %{_bindir}/%{name}
-%{_bindir}/%{name}conf
-%{_bindir}/%{name}introspect
-%{_bindir}/%{name}test
-%{_bindir}/wraptool
 %{python3_sitelib}/%{libname}/
 %{python3_sitelib}/%{name}-*.egg-info/
 %{_mandir}/man1/%{name}.1*
-%{_mandir}/man1/%{name}conf.1*
-%{_mandir}/man1/%{name}introspect.1*
-%{_mandir}/man1/%{name}test.1*
-%{_mandir}/man1/wraptool.1*
-//usr/lib/rpm/macros.d/macros.%{name}
+/usr/lib/rpm//macros.d/macros.%{name}
 %dir %{_datadir}/polkit-1
 %dir %{_datadir}/polkit-1/actions
 %{_datadir}/polkit-1/actions/com.mesonbuild.install.policy
 
+
 %changelog
-* Sat Aug 25 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.47.2-1
-- Update to 0.47.2
+* Mon Feb 04 2019 Stephen Gallagher <sgallagh@redhat.com> - 0.49.2-1
+- Update to 0.49.2
+- Drop upstreamed patch
+- Resolves: rhbz#1666733
 
-* Tue Jul 10 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.47.1-1
-- Update to 0.47.1
+* Mon Dec 10 2018 Stephen Gallagher <sgallagh@redhat.com> - 0.45.1-3
+- Backport patch to fix gnome.mkenums_simple() when used with file() arguments
 
-* Thu May 17 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.46.1-1
-- Update to 0.46.1
+* Mon Aug 13 2018 Troy Dawson <tdawson@redhat.com> - 0.45.1-2
+- Add Requires python3-devel
 
-* Fri Feb 23 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.44.1-1
+* Wed Mar 21 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.45.1-1
+- Update to 0.45.1
+
+* Sun Mar 04 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.45.0-1
+- Update to 0.45.0
+
+* Tue Feb 20 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.44.1-1
 - Update to 0.44.1
 
+* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.44.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Sun Dec 10 2017 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.44.0-1
+- Update to 0.44.0
+
+* Mon Oct 09 2017 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.43.0-1
+- Update to 0.43.0
+
 * Tue Sep 12 2017 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.42.1-1
 - Update to 0.42.1
 
-* Mon Sep 04 2017 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.42.0-1.1
-- Fix %%meson macro on F25
-
 * Fri Aug 18 2017 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.42.0-1
 - Update to 0.42.0