From efa78770193f1652c0415ebfb3e32b301e2636d8 Mon Sep 17 00:00:00 2001 From: basebuilder_pel7x64builder0 Date: Mon, 26 Nov 2018 17:49:41 +0100 Subject: [PATCH] meson package update to include python3 Signed-off-by: basebuilder_pel7x64builder0 --- SPECS/meson.spec | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/SPECS/meson.spec b/SPECS/meson.spec index ce158b38..d75295dc 100644 --- a/SPECS/meson.spec +++ b/SPECS/meson.spec @@ -14,8 +14,8 @@ Patch0002: 0002-rpm-pass-auto-features-enabled-skip-ci.patch BuildArch: noarch Obsoletes: %{name}-gui < 0.31.0-3 -BuildRequires: python%{python3_other_pkgversion}-devel -BuildRequires: python%{python3_other_pkgversion}-setuptools +BuildRequires: python3-devel +BuildRequires: python3-setuptools BuildRequires: python3-rpm-macros BuildRequires: ninja-build Requires: ninja-build @@ -33,11 +33,11 @@ find -type f -name '*.py' -executable -exec sed -i -e '1s|.*|#!%{__python3}|' {} sed -i -e "/^%%__meson /s| .*$| %{_bindir}/%{name}|" data/macros.%{name} %build -%py3_other_build +%py3_build %install -%py3_other_install -install -Dpm0644 data/macros.%{name} %{buildroot}%{rpmmacrodir}/macros.%{name} +%py3_install +install -Dpm0644 data/macros.%{name} %{buildroot}/usr/lib/rpm/macros.d/macros.%{name} %files %license COPYING @@ -46,14 +46,14 @@ install -Dpm0644 data/macros.%{name} %{buildroot}%{rpmmacrodir}/macros.%{name} %{_bindir}/%{name}introspect %{_bindir}/%{name}test %{_bindir}/wraptool -%{python3_other_sitelib}/%{libname}/ -%{python3_other_sitelib}/%{name}-*.egg-info/ +%{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* -%{rpmmacrodir}/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