From 7b445549c553a505c4717cff4bdbf7777b45524a Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Fri, 5 Jan 2024 21:50:31 +0100 Subject: [PATCH] fix requirements with python3 [release 4.2.23-3mamba;Sat Aug 15 2020] --- dnf.spec | 55 ++++++++++++++++++++++++++++++++++++------------------- 1 file changed, 36 insertions(+), 19 deletions(-) diff --git a/dnf.spec b/dnf.spec index f566bfb..54e7ec9 100644 --- a/dnf.spec +++ b/dnf.spec @@ -1,6 +1,6 @@ Name: dnf -Version: 4.2.18 -Release: 1mamba +Version: 4.2.23 +Release: 3mamba Summary: Package manager based on libdnf and libsolv Group: System/Management Vendor: openmamba @@ -18,18 +18,19 @@ Patch6: dnf-4.2.18-i586-default-arch.patch Patch7: dnf-4.2.18-arm-default-arch.patch License: GPL ## AUTOBUILDREQ-BEGIN -BuildRequires: libpython-devel +BuildRequires: libpython3-devel ## AUTOBUILDREQ-END BuildRequires: cmake Requires: librepo Requires: libcomps Requires: libsolv -Requires: libdnf >= 0.31.0 -Requires: python-rpm -Requires: python-gpg -Requires: python-backports-lzma -Requires: python-iniparse -Requires: python-enum34 +Requires: libdnf >= 0.48.0 +Requires: python-rpm-py3 +Requires: python-gpg-py3 +Requires: python-libcomps-py3 +#Requires: python-backports-lzma-py3 +#Requires: python-iniparse-py3 +#Requires: python-enum34-py3 %{?systemd_requires} Provides: dnf-command(alias) Provides: dnf-command(autoremove) @@ -80,7 +81,8 @@ This package provides a configuration compatibility layer with YUM. %patch7 -p1 %build -%cmake -d build +%cmake -d build \ + -DPYTHON_DESIRED=3 %make make doc @@ -90,18 +92,18 @@ make doc %makeinstall -C build %ifarch x86_64 -install -d %{buildroot}%{python_sitearch} -mv %{buildroot}%{python_sitelib}/dnf %{buildroot}%{python_sitearch} +install -d %{buildroot}%{python3_sitearch} +mv %{buildroot}%{python3_sitelib}/dnf %{buildroot}%{python3_sitearch} %endif -ln -s dnf-2 %{buildroot}%{_bindir}/dnf -ln -s dnf-automatic-2 %{buildroot}%{_bindir}/dnf-automatic +ln -s dnf-3 %{buildroot}%{_bindir}/dnf +ln -s dnf-automatic-3 %{buildroot}%{_bindir}/dnf-automatic install -d %{buildroot}/lib mv %{buildroot}%{_prefix}/lib/systemd %{buildroot}/lib/ # YUM compat layer -ln -sr %{buildroot}%{_bindir}/dnf-2 %{buildroot}%{_bindir}/yum +ln -sr %{buildroot}%{_bindir}/dnf-3 %{buildroot}%{_bindir}/yum mkdir -p %{buildroot}%{_sysconfdir}/yum #ln -sr %{buildroot}%{_sysconfdir}/dnf/dnf.conf %{buildroot}%{_sysconfdir}/yum/yum.conf #ln -sr %{buildroot}%{_sysconfdir}/dnf/pluginconf.d %{buildroot}%{_sysconfdir}/yum/pluginconf.d @@ -138,10 +140,10 @@ mkdir -p %{buildroot}%{_sysconfdir}/yum %{_sysconfdir}/logrotate.d/dnf %{_bindir}/dnf %{_bindir}/dnf-automatic -%{_bindir}/dnf-2 -%{_bindir}/dnf-automatic-2 -%dir %{python_sitearch}/dnf -%{python_sitearch}/dnf/* +%{_bindir}/dnf-3 +%{_bindir}/dnf-automatic-3 +%dir %{python3_sitearch}/dnf +%{python3_sitearch}/dnf/* %{_unitdir}/dnf-automatic-download.service %{_unitdir}/dnf-automatic-download.timer %{_unitdir}/dnf-automatic-install.service @@ -176,6 +178,21 @@ mkdir -p %{buildroot}%{_sysconfdir}/yum %{_mandir}/man8/yum.8* %changelog +* Sat Aug 15 2020 Silvan Calarco 4.2.23-3mamba +- fix requirements with python3 + +* Fri Aug 14 2020 Silvan Calarco 4.2.23-2mamba +- rebuilt with python3 + +* Tue Jun 02 2020 Automatic Build System 4.2.23-1mamba +- automatic version update by autodist + +* Wed Apr 01 2020 Automatic Build System 4.2.21-1mamba +- automatic version update by autodist + +* Mon Feb 24 2020 Automatic Build System 4.2.19-1mamba +- automatic version update by autodist + * Thu Jan 16 2020 Automatic Build System 4.2.18-1mamba - automatic version update by autodist