import from EL-7

5 files changed, 423 insertions, 0 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..01f0400
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,9 @@
+clog
+package-*.xml
+*.tgz
+*.tar.bz2
+*.tar.gz
+*.tar.xz
+*.tar.xz.asc
+*.src.rpm
+*/*rpm
diff --git a/0001-macros-Do-not-use-shrink.patch b/0001-macros-Do-not-use-shrink.patch
new file mode 100644
index 0000000..85fdc34
--- /dev/null
+++ b/0001-macros-Do-not-use-shrink.patch
@@ -0,0 +1,95 @@
+From a2749a143097e46bda7c6b5f870f39e0e32763d6 Mon Sep 17 00:00:00 2001
+From: Igor Raits <i.gnatenko.brain@gmail.com>
+Date: Sun, 30 Aug 2020 18:18:20 +0200
+Subject: [PATCH] macros: Do not use %{shrink:}
+
+It is not supported by EL7 RPM.
+
+Signed-off-by: Igor Raits <i.gnatenko.brain@gmail.com>
+---
+ data/macros.meson | 66 +++++++++++++++++++++++------------------------
+ 1 file changed, 33 insertions(+), 33 deletions(-)
+
+diff --git a/data/macros.meson b/data/macros.meson
+index cc4953c5f..657f2b493 100644
+--- a/data/macros.meson
++++ b/data/macros.meson
+@@ -4,42 +4,42 @@
+ 
+ %meson \
+     %set_build_flags \
+-    %{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} \
+-        --auto-features=%{__meson_auto_features} \
+-        %{_vpath_srcdir} %{_vpath_builddir} \
+-        %{nil}}
++    %{__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} \\\
++        --auto-features=%{__meson_auto_features} \\\
++        %{_vpath_srcdir} %{_vpath_builddir} \\\
++        %{nil}
+ 
+ %meson_build \
+-    %{shrink:%{__meson} compile \
+-        -C %{_vpath_builddir} \
+-        -j %{_smp_build_ncpus} \
+-        --verbose \
+-        %{nil}}
++    %{__meson} compile \\\
++        -C %{_vpath_builddir} \\\
++        -j %{_smp_build_ncpus} \\\
++        --verbose \\\
++        %{nil}
+ 
+ %meson_install \
+-    %{shrink:DESTDIR=%{buildroot} %{__meson} install \
+-        -C %{_vpath_builddir} \
+-        --no-rebuild \
+-        %{nil}}
++    DESTDIR=%{buildroot} %{__meson} install \\\
++        -C %{_vpath_builddir} \\\
++        --no-rebuild \\\
++        %{nil}
+ 
+ %meson_test \
+-    %{shrink:%{__meson} test \
+-        -C %{_vpath_builddir} \
+-        --num-processes %{_smp_build_ncpus} \
+-        --print-errorlogs \
+-        %{nil}}
++    %{__meson} test \\\
++        -C %{_vpath_builddir} \\\
++        --num-processes %{_smp_build_ncpus} \\\
++        --print-errorlogs \\\
++        %{nil}
+-- 
+2.28.0
+
diff --git a/0001-mcompile-use-v-instead-of-verbose-for-ninja.patch b/0001-mcompile-use-v-instead-of-verbose-for-ninja.patch
new file mode 100644
index 0000000..fa38c5b
--- /dev/null
+++ b/0001-mcompile-use-v-instead-of-verbose-for-ninja.patch
@@ -0,0 +1,28 @@
+From c466054902dde6ecf353d6f4a22a6c878fd6dd6f Mon Sep 17 00:00:00 2001
+From: Igor Raits <i.gnatenko.brain@gmail.com>
+Date: Sun, 30 Aug 2020 18:17:26 +0200
+Subject: [PATCH] mcompile: use -v instead of --verbose for ninja
+
+The `--verbose` has been added to ninja in 1.9.0 and we pretend that we have compatibility with Ninja 1.7+.
+
+References: https://github.com/ninja-build/ninja/commit/bf7517505ad1def03e13bec2b4131399331bc5c4
+---
+ mesonbuild/mcompile.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mesonbuild/mcompile.py b/mesonbuild/mcompile.py
+index 9fe3a65f5..5352143d9 100644
+--- a/mesonbuild/mcompile.py
++++ b/mesonbuild/mcompile.py
+@@ -156,7 +156,7 @@ def get_parsed_args_ninja(options: 'argparse.Namespace', builddir: Path) -> T.Li
+         cmd.extend(['-l', str(options.load_average)])
+ 
+     if options.verbose:
+-        cmd.append('--verbose')
++        cmd.append('-v')
+ 
+     cmd += options.ninja_args
+ 
+-- 
+2.28.0
+
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..1e65467
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,4 @@
+SRCDIR := $(shell pwd)
+NAME := $(shell basename $(SRCDIR))
+include ../common/Makefile
+
diff --git a/meson.spec b/meson.spec
new file mode 100644
index 0000000..2776be0
--- /dev/null
+++ b/meson.spec
@@ -0,0 +1,287 @@
+%global libname mesonbuild
+
+
+Name:           meson
+Version:        0.55.1
+Release:        1%{?dist}
+Summary:        High productivity build system
+
+License:        ASL 2.0
+URL:            https://mesonbuild.com/
+Source:         https://github.com/mesonbuild/meson/releases/download/%{version}/meson-%{version}.tar.gz
+# Non-upstreamable
+Patch0001:      0001-macros-Do-not-use-shrink.patch
+# https://github.com/mesonbuild/meson/pull/7669
+Patch0002:      0001-mcompile-use-v-instead-of-verbose-for-ninja.patch
+
+BuildArch:      noarch
+
+BuildRequires:  python3-devel
+BuildRequires:  python3-setuptools
+Requires:       python%{python3_version}dist(setuptools)
+Requires:       ninja-build
+
+%description
+Meson is a build system designed to optimize programmer
+productivity. It aims to do this by providing simple, out-of-the-box
+support for modern software development tools and practices, such as
+unit tests, coverage reports, Valgrind, CCache and the like.
+
+%prep
+%autosetup -p1
+# Macro should not change when we are redefining bindir
+sed -i -e "/^%%__meson /s| .*$| %{_bindir}/%{name}|" data/macros.%{name}
+
+%build
+%py3_build
+
+%install
+%py3_install
+mkdir -p %{buildroot}%{rpmmacrodir}
+install -Dpm0644 -t %{buildroot}%{rpmmacrodir} data/macros.%{name}
+
+%files
+%license COPYING
+%{_bindir}/%{name}
+%{python3_sitelib}/%{libname}/
+%{python3_sitelib}/%{name}-*.egg-info/
+%{_mandir}/man1/%{name}.1*
+%{rpmmacrodir}/macros.%{name}
+%dir %{_datadir}/polkit-1
+%dir %{_datadir}/polkit-1/actions
+%{_datadir}/polkit-1/actions/com.mesonbuild.install.policy
+
+%changelog
+* Sun Aug 30 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 0.55.1-1
+- Update to 0.55.1
+
+* Thu Mar 07 2019 Troy Dawson <tdawson@redhat.com> - 0.47.2-2
+- Rebuilt to change main python from 3.4 to 3.6
+
+* Sat Aug 25 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.47.2-1
+- Update to 0.47.2
+
+* Tue Jul 10 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.47.1-1
+- Update to 0.47.1
+
+* Thu May 17 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.46.1-1
+- Update to 0.46.1
+
+* Fri Feb 23 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.44.1-1
+- Update to 0.44.1
+
+* 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
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.41.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Wed Jul 19 2017 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.41.2-1
+- Update to 0.41.2
+
+* Tue Jul 18 2017 Kalev Lember <klember@redhat.com> - 0.41.1-3
+- Backport various gtk-doc fixes from upstream
+
+* Thu Jul 13 2017 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.41.1-2
+- Strip trailing slash from pkg-config files
+
+* Mon Jun 19 2017 Igor Gnatenko <ignatenko@redhat.com> - 0.41.1-1
+- Update to 0.41.1
+
+* Tue Jun 13 2017 Igor Gnatenko <ignatenko@redhat.com> - 0.41.0-1
+- Update to 0.41.0
+
+* Wed May 31 2017 Igor Gnatenko <ignatenko@redhat.com> - 0.40.1-2
+- Don't run ldc tests
+
+* Fri Apr 28 2017 Igor Gnatenko <ignatenko@redhat.com> - 0.40.1-1
+- Update to 0.40.1
+
+* Sun Apr 23 2017 Igor Gnatenko <ignatenko@redhat.com> - 0.40.0-1
+- Update to 0.40.0
+
+* Thu Apr 13 2017 Igor Gnatenko <ignatenko@redhat.com> - 0.39.1-2
+- Exclude ldc for module builds
+
+* Thu Mar 16 2017 Igor Gnatenko <ignatenko@redhat.com> - 0.39.1-1
+- Update to 0.39.1
+
+* Mon Mar 06 2017 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.39.0-1
+- Update to 0.39.0
+
+* Tue Feb 07 2017 Igor Gnatenko <ignatenko@redhat.com> - 0.38.1-1
+- Update to 0.38.1
+
+* Sun Jan 29 2017 Igor Gnatenko <ignatenko@redhat.com> - 0.38.0-1
+- Update to 0.38.0
+
+* Thu Dec 22 2016 Miro Hrončok <mhroncok@redhat.com> - 0.37.1-2
+- Rebuild for Python 3.6
+
+* Tue Dec 20 2016 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 0.37.1-1
+- Update to 0.37.1
+
+* Mon Dec 19 2016 Miro Hrončok <mhroncok@redhat.com> - 0.37.0-2
+- Rebuild for Python 3.6
+
+* Sun Dec 18 2016 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 0.37.0-1
+- Update to 0.37.0
+
+* Thu Dec 15 2016 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 0.36.0-4
+- Backport more RPM macro fixes (FPC ticket #655)
+
+* Tue Dec 13 2016 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 0.36.0-3
+- Backport fixes to RPM macros
+
+* Sat Dec 03 2016 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 0.36.0-2
+- Print test output during build
+
+* Mon Nov 14 2016 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 0.36.0-1
+- Update to 0.36.0
+
+* Tue Oct 18 2016 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 0.35.1-1
+- Update to 0.35.1 (RHBZ #1385986)
+
+* Tue Oct 11 2016 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 0.35.0-3
+- Backport couple of fixes
+
+* Wed Oct 05 2016 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 0.35.0-2
+- Apply patch to fix FTBFS
+
+* Mon Oct 03 2016 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 0.35.0-1
+- Update to 0.35.0
+
+* Wed Sep 07 2016 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 0.34.0-2
+- Run D test suite
+
+* Wed Sep 07 2016 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 0.34.0-1
+- Update to 0.34.0
+
+* Tue Aug 09 2016 Jon Ciesla <limburgher@gmail.com> - 0.33.0-2
+- Obsoletes fix.
+
+* Tue Aug 09 2016 Jon Ciesla <limburgher@gmail.com> - 0.33.0-1
+- 0.33.0
+- GUI dropped upstream.
+
+* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.31.0-2
+- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
+
+* Thu Apr 14 2016 Igor Gnatenko <ignatenko@redhat.com> - 0.31.0-1
+- Update to 0.31.0
+
+* Sun Mar 20 2016 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 0.30.0-1
+- Update to 0.30.0
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.29.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Sun Jan 24 2016 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 0.29.0-1
+- Update to 0.29.0
+
+* Fri Jan 15 2016 Jonathan Wakely <jwakely@redhat.com> - 0.28.0-2
+- Rebuilt for Boost 1.60
+
+* Mon Dec 28 2015 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 0.28.0-1
+- 0.28.0
+
+* Wed Nov 25 2015 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 0.27.0-1
+- 0.27.0
+
+* Tue Nov 10 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.26.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5
+
+* Fri Oct 30 2015 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 0.26.0-2
+- Fix rpm macros for using optflags
+
+* Sun Sep 13 2015 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 0.26.0-1
+- 0.26.0
+
+* Thu Aug 27 2015 Jonathan Wakely <jwakely@redhat.com> - 0.25.0-4
+- Rebuilt for Boost 1.59
+
+* Wed Jul 29 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.25.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159
+
+* Wed Jul 22 2015 David Tardon <dtardon@redhat.com> - 0.25.0-2
+- rebuild for Boost 1.58
+
+* Sun Jul 12 2015 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 0.25.0-1
+- 0.25.0
+
+* Sat Jul 11 2015 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 0.24.0-3
+- Update URLs
+- drop unneded hacks in install section
+- enable print test output for tests
+
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.24.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Mon May 25 2015 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 0.24.0-1
+- Update to 0.24.0
+
+* Thu May 21 2015 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 0.23.0-3.20150328git0ba1d54
+- Update to latest git
+
+* Thu May 21 2015 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 0.23.0-3
+- Add patch to accept .S files
+
+* Wed Apr 29 2015 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 0.23.0-2
+- Add python3 to Requires (Thanks to Ilya Kyznetsov)
+
+* Tue Mar 31 2015 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 0.23.0-1
+- 0.23.0
+
+* Sat Mar 28 2015 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 0.22.0-9.20150328git3b49b71
+- Update to latest git
+
+* Mon Mar 23 2015 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 0.22.0-9.20150325git18550fe
+- Update to latest git
+- Include mesonintrospect
+
+* Mon Mar 23 2015 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 0.22.0-9.20150322git78d31ca
+- Fix filelists for mesongui (python-bytecode-without-source)
+
+* Sun Mar 22 2015 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 0.22.0-8.20150322git78d31ca
+- Enable C# tests
+
+* Sun Mar 22 2015 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 0.22.0-7.20150322git78d31ca
+- update to latest git
+- fix tests on arm
+
+* Sat Mar 21 2015 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 0.22.0-7.20150321gita084a8e
+- update to latest git
+
+* Mon Mar 16 2015 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 0.22.0-7.20150316gitfa2c659
+- update to latest git
+
+* Tue Mar 10 2015 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 0.22.0-7.20150310gitf9f51b1
+- today's git snapshot with support for cool GNOME features
+- re-enable wxGTK3 tests, package fixed in rawhide
+
+* Thu Feb 26 2015 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 0.22.0-6.git7581895
+- split gui to subpkg
+- update to latest snapshot
+- enable tests
+
+* Thu Feb 26 2015 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 0.22.0-5.gitc6dbf98
+- Fix packaging style
+- Make package noarch
+
+* Mon Feb 23 2015 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 0.22.0-4.git.c6dbf98
+- Use development version
+
+* Sat Feb 21 2015 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 0.22.0-3
+- Add ninja-build to requires
+
+* Thu Jan 22 2015 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.22.0-2
+- fix shebang in python files
+
+* Wed Jan 21 2015 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.22.0-1
+- Initial package