.gitignore

@@ -1 +1 @@
-/meson-*.tar.gz
+SOURCES/meson-0.58.2.tar.gz

.meson.metadata

@@ -0,0 +1 @@
+4058a574a8a1335102b24981d049fd82ccdb4150 SOURCES/meson-0.58.2.tar.gz

SPECS/meson.spec

@@ -1,219 +1,149 @@
-* Tue Apr 26 2022 Marc-André Lureau <marcandre.lureau@redhat.com> - 0.62.1-1
+%global libname mesonbuild
-- Update to 0.62.1
 
-* Tue Mar 15 2022 Marc-André Lureau <marcandre.lureau@redhat.com> - 0.61.3-1
+# Don’t run the tests by default, since they are rather flaky.
-- Update to 0.61.3
+# I’ll get to getting them running eventually, but free time is sparse.
-- Install zsh & bash completion
+# — ekulik
+%bcond_with check
 
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.60.3-2
+Name:           meson
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+Version:        0.58.2
+Release:        2%{?dist}
+Summary:        High productivity build system
 
-* Sun Dec 26 2021 Kalev Lember <klember@redhat.com> - 0.60.3-1
+License:        ASL 2.0
-- Update to 0.60.3
+URL:            https://mesonbuild.com/
+Source:         https://github.com/mesonbuild/meson/releases/download/%{version}/%{name}-%{version}.tar.gz
 
-* Mon Dec 06 2021 Kalev Lember <klember@redhat.com> - 0.60.2-1
+BuildArch:      noarch
-- Update to 0.60.2
 
-* Fri Nov 12 2021 Neal Gompa <ngompa@fedoraproject.org> - 0.60.1-1
+BuildRequires:  python3-devel
-- Update to 0.60.1
+BuildRequires:  python3-setuptools
+Requires:       python%{python3_version}dist(setuptools)
+Requires:       ninja-build
+Requires:       python3-devel
 
-* Thu Oct 28 2021 Kalev Lember <klember@redhat.com> - 0.59.4-1
+%if %{with check}
-- Update to 0.59.4
+BuildRequires:  ninja-build
+# Some tests expect the unversioned executable
+BuildRequires:  /usr/bin/python
+# Various languages
+BuildRequires:  gcc
+BuildRequires:  libasan
+BuildRequires:  gcc-c++
+BuildRequires:  gcc-gfortran
+BuildRequires:  gcc-objc
+BuildRequires:  gcc-objc++
+BuildRequires:  java-devel
+BuildRequires:  libomp-devel
+BuildRequires:  mono-core mono-devel
+BuildRequires:  rust
+# Since the build is noarch, we can't use %%ifarch
+#%%ifarch %%{ldc_arches}
+#BuildRequires:  ldc
+#%%endif
+# Various libs support
+BuildRequires:  boost-devel
+BuildRequires:  gtest-devel
+BuildRequires:  gmock-devel
+BuildRequires:  qt5-qtbase-devel
+BuildRequires:  qt5-qtbase-private-devel
+BuildRequires:  qt5-linguist
+BuildRequires:  vala
+BuildRequires:  python3-gobject-base
+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)
+BuildRequires:  gtk-doc
+BuildRequires:  itstool
+BuildRequires:  pkgconfig(zlib)
+BuildRequires:  python3dist(cython)
+BuildRequires:  pkgconfig(sdl2)
+BuildRequires:  %{_bindir}/pcap-config
+BuildRequires:  pkgconfig(vulkan)
+BuildRequires:  llvm-devel
+BuildRequires:  cups-devel
+%endif
 
-* Sat Oct 23 2021 Kalev Lember <klember@redhat.com> - 0.59.3-1
+%description
-- Update to 0.59.3
+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.
 
-* Sat Aug 21 2021 Kalev Lember <klember@redhat.com> - 0.59.1-1
+%prep
-- Update to 0.59.1
+%autosetup -p1
+# Macro should not change when we are redefining bindir
+sed -i -e "/^%%__meson /s| .*$| %{_bindir}/%{name}|" data/macros.%{name}
 
-* Tue Aug 17 2021 Adam Williamson <awilliam@redhat.com> - 0.59.0-2
+%build
-- Backport PR #9027 to fix a bug that broke some test suites (#1994006)
+%py3_build
 
-* Fri Jul 23 2021 Marc-André Lureau <marcandre.lureau@redhat.com> - 0.59.0-1
+%install
-- new version
+%py3_install
+install -Dpm0644 -t %{buildroot}%{rpmmacrodir} data/macros.%{name}
 
-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.58.0-5
+%if %{with check}
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+%check
+# Remove Boost tests for now, because it requires Python 2
+rm -rf "test cases/frameworks/1 boost"
+# Remove MPI tests for now because it is complicated to run
+rm -rf "test cases/frameworks/17 mpi"
+export MESON_PRINT_TEST_OUTPUT=1
+%{__python3} ./run_tests.py
+%endif
 
-* Thu Jun 03 2021 Python Maint <python-maint@redhat.com> - 0.58.0-4
+%files
-- Rebuilt for Python 3.10
+%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
 
-* Tue May 25 2021 Ondrej Holy <oholy@redhat.com> - 0.58.0-3
-- Backport upstream patch to fix environment variable regression
 
-* Thu May 20 2021 Kalev Lember <klember@redhat.com> - 0.58.0-2
+%changelog
-- Backport upstream patch to fix gtkdoc generation
+* Tue Nov 16 2021 Tomas Pelka <tpelka@redhat.com> - 0.58.2-2
+- Bump release and rebuild in -candidate target to fix gating issues
+  Resolves: rhbz#2006519
 
-* Wed May 05 2021 Marc-André Lureau <marcandre.lureau@redhat.com> - 0.58.0-1
+* Mon Oct 18 2021 Eduardo Lima (Etrunko) <etrunko@redhat.com> - 0.58.2-1
-- new version
+- Update meson to 0.58-2
+  Resolves: rhbz#2006519
 
-* Sun Apr 11 2021 Kalev Lember <klember@redhat.com> - 0.57.2-1
+* Tue Dec 15 2020 Danilo C. L. de Paula <ddepaula@redhat.com> - 0.55.3-3
-- Update to 0.57.2
+- build: use PIE objects for static libraries
+  Resolves: rhbz#1899620
+  (meson builds QEMU with PIC objects instead of PIE)
 
-* Fri Mar 05 2021 Igor Raits <ignatenkobrain@fedoraproject.org> - 0.57.1-1
+* Thu Oct 15 2020 Danilo C. L. de Paula <ddepaula@redhat.com> - 0.55.3-2
-- Update to 0.57.1
+- Add python3-devel dependency, as asked by the BZ..
+- Resolves: rhbz#1872692
 
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.56.2-2
+* Thu Oct 08 2020 Danilo de Paula <ddepaula@redhat.com> - 0.55.3-1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+- Update to 0.55.3, based on upstream Fedora
+- Resolves: rhbz#1872692
 
-* Thu Jan 21 2021 Kalev Lember <klember@redhat.com> - 0.56.2-1
+* Mon Feb 04 2019 Stephen Gallagher <sgallagh@redhat.com> - 0.49.2-1
-- Update to 0.56.2
-
-* Tue Nov 10 2020 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 0.56.0-1
-- Update to latest version (#1889242)
-
-* Fri Nov 06 2020 Jeff Law <law@redhat.com> - 0.55.3-2
-- Avoid bogus volatile in gnome modules support code caught by gcc-11
-
-* Fri Sep 11 2020 Kalev Lember <klember@redhat.com> - 0.55.3-1
-- Update to 0.55.3
-
-* Thu Sep 10 2020 Kalev Lember <klember@redhat.com> - 0.55.2-1
-- Update to 0.55.2
-
-* Thu Aug 20 2020 Kalev Lember <klember@redhat.com> - 0.55.1-1
-- Update to 0.55.1
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.55.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Sun Jul 12 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 0.55.0-1
-- Update to 0.55.0
-
-* Mon Jul 06 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 0.55.0~rc2-1
-- Update to 0.55.0rc2
-
-* Fri Jul 03 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 0.55.0~rc1-1
-- Update to 0.55.0rc1
-
-* Thu Jun 18 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 0.54.3-2
-- Use verbose mode for meson compile
-
-* Mon Jun 15 2020 Kalev Lember <klember@redhat.com> - 0.54.3-1
-- Update to 0.54.3
-
-* Mon Jun 15 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 0.54.2-3
-- Switch to meson compile / meson install
-
-* Fri May 22 2020 Miro Hrončok <mhroncok@redhat.com> - 0.54.2-2
-- Rebuilt for Python 3.9
-
-* Fri May 15 2020 Kalev Lember <klember@redhat.com> - 0.54.2-1
-- Update to 0.54.2
-
-* Thu May 07 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 0.54.1-1
-- Update to 0.54.1
-
-* Mon Mar 30 2020 - Ernestas Kulik <ekulik@redhat.com> - 0.54.0-1
-- Update to 0.54.0
-
-* Sat Mar 14 2020 - Ernestas Kulik <ekulik@redhat.com> - 0.53.2-1.git88e40c7
-- Update to snapshot of 0.53.2 with D fixes
-
-* Fri Feb 07 2020 - Ernestas Kulik <ekulik@redhat.com> - 0.53.1-1
-- Update to 0.53.1
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.52.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Dec 26 2019 Björn Esser <besser82@fedoraproject.org> - 0.52.1-1
-- Update to 0.52.1
-
-* Wed Oct 09 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.52.0-1
-- Update to 0.52.0
-
-* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 0.51.2-2
-- Rebuilt for Python 3.8.0rc1 (#1748018)
-
-* Mon Aug 26 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.51.2-1
-- Update to 0.51.2
-
-* Thu Aug 15 2019 Miro Hrončok <mhroncok@redhat.com> - 0.51.1-3
-- Rebuilt for Python 3.8
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.51.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Wed Jul 10 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.51.1-1
-- Update to 0.51.1
-
-* Mon Jun 17 10:03:21 CEST 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.51.0-1
-- Update to 0.51
-
-* Wed Apr 17 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.50.1-1
-- Update to 0.50.1
-
-* Mon Apr 15 2019 Adam Williamson <awilliam@redhat.com> - 0.50.0-4
-- Backport patch to revert ld binary method change (#1699099)
-
-* Mon Apr 08 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.50.0-3
-- Drop -Db_ndebug=true and just fix it instead
-
-* Mon Mar 25 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.50.0-2
-- Set -Db_ndebug=true
-
-* Sun Mar 10 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.50.0-1
-- Update to 0.50.0
-
-* Mon Feb 04 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.49.2-1
 - Update to 0.49.2
+- Drop upstreamed patch
+- Resolves: rhbz#1666733
 
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.49.1-2
+* Mon Dec 10 2018 Stephen Gallagher <sgallagh@redhat.com> - 0.45.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+- Backport patch to fix gnome.mkenums_simple() when used with file() arguments
 
-* Wed Jan 23 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.49.1-1
+* Mon Aug 13 2018 Troy Dawson <tdawson@redhat.com> - 0.45.1-2
-- Update to 0.49.1
+- Add Requires python3-devel
-
-* Sun Dec 09 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.49.0-1
-- Update to 0.49.0
-
-* Sat Nov 17 2018 Kalev Lember <klember@redhat.com> - 0.48.2-1
-- Update to 0.48.2
-
-* Sun Oct 21 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.48.1-1
-- Update to 0.48.1
-
-* Wed Sep 26 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.48.0-2
-- Add missing dependency on setuptools
-
-* 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
-
-* Wed Jul 25 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.47.1-5
-- Backport more patches for "feature" option type
-
-* Tue Jul 24 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.47.1-4
-- Don't sneak auto-features patch yet
-
-* Tue Jul 24 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.47.1-3
-- Macros improvements
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.47.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Tue Jul 10 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.47.1-1
-- Update to 0.47.1
-
-* Mon Jul 02 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.47.0-1
-- Update to 0.47.0
-
-* Thu Jun 28 2018 Miro Hrončok <mhroncok@redhat.com> - 0.46.1-3
-- Fix error on Python 3.7 (#1596230)
-
-* Mon Jun 18 2018 Miro Hrončok <mhroncok@redhat.com> - 0.46.1-2
-- Rebuilt for Python 3.7
-
-* Thu May 17 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.46.1-1
-- Update to 0.46.1
-
-* Fri May 04 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.46.0-2
-- Backport upstream fixes
-
-* Tue Apr 24 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.46.0-1
-- Update to 0.46.0
 
 * Wed Mar 21 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.45.1-1
 - Update to 0.45.1

gating.yaml

@@ -1,6 +0,0 @@
---- !Policy
-product_versions:
-  - rhel-10
-decision_context: osci_compose_gate
-rules:
-  - !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}

meson.spec

@@ -1,142 +0,0 @@
-%global libname mesonbuild
-
-%bcond check 1
-
-Name:           meson
-Version:        1.7.2
-Release:        %autorelease
-Summary:        High productivity build system
-
-License:        Apache-2.0
-URL:            https://mesonbuild.com/
-Source:         https://github.com/mesonbuild/meson/releases/download/%{version_no_tilde .}/meson-%{version_no_tilde %{quote:}}.tar.gz
-
-BuildArch:      noarch
-
-BuildRequires:  python3-devel
-BuildRequires:  python3-setuptools
-Requires:       python%{python3_version}dist(setuptools)
-Requires:       ninja-build
-
-%if %{with check}
-BuildRequires:  ninja-build
-# Some tests expect the unversioned executable
-BuildRequires:  /usr/bin/python
-# Various languages
-BuildRequires:  gcc
-BuildRequires:  libasan
-BuildRequires:  gcc-c++
-BuildRequires:  gcc-gfortran
-%if %{undefined rhel}
-BuildRequires:  gcc-objc
-BuildRequires:  gcc-objc++
-%endif
-BuildRequires:  java-devel
-BuildRequires:  libomp-devel
-%if %{undefined rhel}
-BuildRequires:  mono-core mono-devel
-%endif
-BuildRequires:  rust
-# Since the build is noarch, we can't use %%ifarch
-#%%ifarch %%{ldc_arches}
-#BuildRequires:  ldc
-#%%endif
-# Various libs support
-BuildRequires:  boost-devel
-BuildRequires:  /usr/bin/clang-format
-%if %{undefined rhel}
-BuildRequires:  clippy
-%endif
-BuildRequires:  gtest-devel
-BuildRequires:  gmock-devel
-%if %{undefined rhel}
-BuildRequires:  qt5-qtbase-devel
-BuildRequires:  qt5-qtbase-private-devel
-BuildRequires:  qt5-linguist
-%endif
-BuildRequires:  vala
-BuildRequires:  python3-gobject-base
-%if %{undefined rhel}
-BuildRequires:  wxGTK-devel
-BuildRequires:  bindgen
-%endif
-%ifnarch riscv64
-BuildRequires:  binutils-gold
-%endif
-BuildRequires:  flex
-BuildRequires:  bison
-BuildRequires:  gettext
-%if %{undefined rhel}
-BuildRequires:  gnustep-base-devel
-BuildRequires:  /usr/bin/gnustep-config
-%endif
-BuildRequires:  git-core
-BuildRequires:  pkgconfig(protobuf)
-BuildRequires:  pkgconfig(glib-2.0)
-%if %{undefined rhel}
-BuildRequires:  pkgconfig(glib-sharp-2.0)
-%endif
-BuildRequires:  pkgconfig(gobject-introspection-1.0)
-BuildRequires:  gtk-doc
-BuildRequires:  itstool
-%if %{undefined rhel}
-BuildRequires:  mercurial
-BuildRequires:  gcovr
-%endif
-BuildRequires:  pkgconfig(zlib)
-BuildRequires:  zlib-static
-BuildRequires:  python3dist(cython)
-BuildRequires:  python3dist(fastjsonschema)
-BuildRequires:  pkgconfig(sdl2)
-BuildRequires:  /usr/bin/pcap-config
-BuildRequires:  pkgconfig(vulkan)
-BuildRequires:  llvm-devel
-BuildRequires:  cups-devel
-%if %{undefined rhel}
-BuildRequires:  /usr/bin/wx-config
-%endif
-BuildRequires:  /usr/bin/sdl2-config
-%endif
-
-%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 -n meson-%{version_no_tilde %{quote:}}
-# 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
-install -Dpm0644 -t %{buildroot}%{rpmmacrodir} data/macros.%{name}
-install -Dpm0644 -t %{buildroot}%{_datadir}/bash-completion/completions/ data/shell-completions/bash/meson
-install -Dpm0644 -t %{buildroot}%{_datadir}/zsh/site-functions/ data/shell-completions/zsh/_meson
-
-%if %{with check}
-%check
-export MESON_PRINT_TEST_OUTPUT=1
-%{python3} ./run_unittests.py -v
-%{python3} ./run_meson_command_tests.py -v
-%endif
-
-%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
-%{_datadir}/bash-completion/completions/meson
-%{_datadir}/zsh/site-functions/_meson
-
-%changelog
-%autochangelog

packit.yaml

@@ -1,32 +0,0 @@
-# See the documentation for more information:
-# https://packit.dev/docs/configuration/
-
-upstream_project_url: https://github.com/mesonbuild/meson
-copy_upstream_release_description: false
-
-# do not sync release candidate versions
-upstream_tag_exclude: ".*rc\\d+"
-
-jobs:
-- job: pull_from_upstream
-  trigger: release
-  dist_git_branches:
-    - fedora-rawhide
-  actions:
-    commit-message:
-    - bash -c 'echo "Update to ${PACKIT_PROJECT_VERSION}"'
-    - bash -c '[ -z "$PACKIT_RESOLVED_BUGS" ] || echo ${PACKIT_RESOLVED_BUGS} | tr " " "\n" | sed "s/^/- Resolves /"'
-    - bash -c 'echo "- Upstream tag: ${PACKIT_UPSTREAM_TAG}"'
-    - bash -c 'echo "- Upstream commit: ${PACKIT_UPSTREAM_COMMIT}"'
-
-
-- job: koji_build
-  trigger: commit
-  allowed_committers: ['packit']
-  dist_git_branches:
-    - fedora-all
-
-- job: bodhi_update
-  trigger: commit
-  dist_git_branches:
-    - fedora-branched

sources

@@ -1 +0,0 @@
-SHA512 (meson-1.7.2.tar.gz) = c3c71ae0e0c31d8d72e200bb5fd5e6584ce41aabe1e85575d50371f82ed02c6e346da3b0b4a2786199b9410daaa1622807a88bfc8ac991cf134bad4a53b3c863