From abd8e7a3df107272e46cbc01ecfc0d3c58e92169 Mon Sep 17 00:00:00 2001 From: Martin Hatina Date: Jul 12 2018 10:50:32 +0000 Subject: Ensure that correct python version is used for build --- diff --git a/dnf.spec b/dnf.spec index 6acd7dc..56f6f47 100644 --- a/dnf.spec +++ b/dnf.spec @@ -74,7 +74,7 @@ It supports RPMs, modules and comps groups & environments. Name: dnf Version: 3.0.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: %{pkg_summary} # For a breakdown of the licensing, see PACKAGE-LICENSING License: GPLv2+ and GPLv2 and GPL @@ -275,7 +275,7 @@ mkdir build-py3 %build %if %{with python2} pushd build-py2 - %cmake .. -DPYTHON_DESIRED:str=2 + %cmake .. -DPYTHON_DESIRED:FILEPATH=%{__python2} %make_build make doc-man popd @@ -283,7 +283,7 @@ mkdir build-py3 %if %{with python3} pushd build-py3 - %cmake .. -DPYTHON_DESIRED:str=3 + %cmake .. -DPYTHON_DESIRED:FILEPATH=%{__python3} %make_build make doc-man popd @@ -401,8 +401,6 @@ rm -vf %{buildroot}%{_bindir}/dnf-automatic-* %dir %{confdir}/modules.d %dir %{confdir}/modules.defaults.d %dir %{pluginconfpath} -%dir %{_sysconfdir}/%{name}/modules.d -%dir %{_sysconfdir}/%{name}/modules.defaults.d %dir %{confdir}/protected.d %dir %{confdir}/vars %config(noreplace) %{confdir}/%{name}.conf @@ -481,6 +479,9 @@ rm -vf %{buildroot}%{_bindir}/dnf-automatic-* %endif %changelog +* Thu Jul 12 2018 Martin Hatina - 3.0.3-2 +- Ensure that correct python version is used for build + * Thu Jul 12 2018 Martin Hatina - 3.0.3-1 - Bug fix release diff --git a/sources b/sources index 65626a1..7968116 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dnf-3.0.3.tar.gz) = 8b67acbe3915e55b52511342da2029007f6bd1ea6d6e9b4a3d811eb5606bd7da172bbfbbb2f4030add84ce0a24d48e537102b2bc7a92e44ca5f19c48f674434f +SHA512 (dnf-3.0.3.tar.gz) = a7b31ed37f6a58679a6b10dc839adea128c519bb37be8b3bc0f5f3854c586bdd676cd692e9804853d78eccea914e3046550e7f5a3663ce9268eab44b839771be