From 0a7b15b1ddda61ea11b80938aaab7108b0d8d71d Mon Sep 17 00:00:00 2001 From: Sergey Zhemoytel Date: Sat, 6 Aug 2022 15:50:08 +0300 Subject: [PATCH] 0.59.4 --- meson.rpmlintrc | 2 ++ meson.spec | 19 +++++++++---------- 2 files changed, 11 insertions(+), 10 deletions(-) create mode 100644 meson.rpmlintrc diff --git a/meson.rpmlintrc b/meson.rpmlintrc new file mode 100644 index 0000000..7f82a31 --- /dev/null +++ b/meson.rpmlintrc @@ -0,0 +1,2 @@ +addFilter("E: invalid-build-requires") + diff --git a/meson.spec b/meson.spec index 9dbf256..542da7f 100644 --- a/meson.spec +++ b/meson.spec @@ -10,9 +10,10 @@ Group: Development/Tools Url: http://mesonbuild.com Source0: https://github.com/mesonbuild/meson/releases/download/%{version}/%{name}-%{version}.tar.gz Source2: %{name}.macros +Source1000: %{name}.rpmlintrc -BuildRequires: python3-devel -BuildRequires: python3-setuptools +BuildRequires: %{_lib}python38-devel +BuildRequires: python38-setuptools %if %{with check} BuildRequires: locales @@ -61,8 +62,8 @@ BuildRequires: pkgconfig(sdl2) BuildRequires: pkgconfig(vapigen) BuildRequires: pkgconfig(vulkan) BuildRequires: pkgconfig(zlib) -BuildRequires: python3-cython -BuildRequires: python3-gobject3 +BuildRequires: python38-cython +BuildRequires: python38-gobject3 BuildRequires: qt5-linguist-tools BuildRequires: qt5-tools BuildRequires: texlive-epstopdf @@ -75,8 +76,6 @@ BuildRequires: wxgtku3.0-devel Requires: ninja Requires: python38-setuptools Requires: python38-pkg-resources -Requires: python3-pkg-resources -Requires: python3-setuptools BuildArch: noarch %description @@ -91,8 +90,8 @@ Valgrind, CCache and the like. %{_datadir}/polkit-1/actions/com.mesonbuild.install.policy %{_mandir}/man1/%{name}.1.* %{_rpmmacrodir}/*%{name}* -%{py3_puresitedir}/%{name}-%{version}-py*.egg-info/ -%{py3_puresitedir}/mesonbuild/ +%{py38_puresitedir}/%{name}-%{version}-py*.egg-info/ +%{py38_puresitedir}/mesonbuild/ #---------------------------------------------------------------------------- @@ -101,11 +100,11 @@ Valgrind, CCache and the like. %build -%py3_build +%py38_build %install -%py3_install +%py38_install # Install our rpm macro helper for meson %install_macro meson %{SOURCE2}