rpms/dnf
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix requirements with python3 [release 4.2.23-3mamba;Sat Aug 15 2020]

Browse Source
This commit is contained in:
Silvan Calarco 2024-01-05 21:50:31 +01:00
parent c65d0aaa8a
commit 7b445549c5
1 changed files with 36 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
dnf.spec
View File

@ -1,6 +1,6 @@
Name: dnf Name: dnf
Version: 4.2.18 Version: 4.2.23
Release: 1mamba Release: 3mamba
Summary: Package manager based on libdnf and libsolv Summary: Package manager based on libdnf and libsolv
Group: System/Management Group: System/Management
Vendor: openmamba Vendor: openmamba
@ -18,18 +18,19 @@ Patch6: dnf-4.2.18-i586-default-arch.patch
Patch7: dnf-4.2.18-arm-default-arch.patch Patch7: dnf-4.2.18-arm-default-arch.patch
License: GPL License: GPL
## AUTOBUILDREQ-BEGIN ## AUTOBUILDREQ-BEGIN
BuildRequires: libpython-devel BuildRequires: libpython3-devel
## AUTOBUILDREQ-END ## AUTOBUILDREQ-END
BuildRequires: cmake BuildRequires: cmake
Requires: librepo Requires: librepo
Requires: libcomps Requires: libcomps
Requires: libsolv Requires: libsolv
Requires: libdnf >= 0.31.0 Requires: libdnf >= 0.48.0
Requires: python-rpm Requires: python-rpm-py3
Requires: python-gpg Requires: python-gpg-py3
Requires: python-backports-lzma Requires: python-libcomps-py3
Requires: python-iniparse #Requires: python-backports-lzma-py3
Requires: python-enum34 #Requires: python-iniparse-py3
#Requires: python-enum34-py3
%{?systemd_requires} %{?systemd_requires}
Provides: dnf-command(alias) Provides: dnf-command(alias)
Provides: dnf-command(autoremove) Provides: dnf-command(autoremove)
@ -80,7 +81,8 @@ This package provides a configuration compatibility layer with YUM.
%patch7 -p1 %patch7 -p1
%build %build
%cmake -d build %cmake -d build \
-DPYTHON_DESIRED=3
%make %make
make doc make doc
@ -90,18 +92,18 @@ make doc
%makeinstall -C build %makeinstall -C build
%ifarch x86_64 %ifarch x86_64
install -d %{buildroot}%{python_sitearch} install -d %{buildroot}%{python3_sitearch}
mv %{buildroot}%{python_sitelib}/dnf %{buildroot}%{python_sitearch} mv %{buildroot}%{python3_sitelib}/dnf %{buildroot}%{python3_sitearch}
%endif %endif
ln -s dnf-2 %{buildroot}%{_bindir}/dnf ln -s dnf-3 %{buildroot}%{_bindir}/dnf
ln -s dnf-automatic-2 %{buildroot}%{_bindir}/dnf-automatic ln -s dnf-automatic-3 %{buildroot}%{_bindir}/dnf-automatic
install -d %{buildroot}/lib install -d %{buildroot}/lib
mv %{buildroot}%{_prefix}/lib/systemd %{buildroot}/lib/ mv %{buildroot}%{_prefix}/lib/systemd %{buildroot}/lib/
# YUM compat layer # 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 mkdir -p %{buildroot}%{_sysconfdir}/yum
#ln -sr %{buildroot}%{_sysconfdir}/dnf/dnf.conf %{buildroot}%{_sysconfdir}/yum/yum.conf #ln -sr %{buildroot}%{_sysconfdir}/dnf/dnf.conf %{buildroot}%{_sysconfdir}/yum/yum.conf
#ln -sr %{buildroot}%{_sysconfdir}/dnf/pluginconf.d %{buildroot}%{_sysconfdir}/yum/pluginconf.d #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 %{_sysconfdir}/logrotate.d/dnf
%{_bindir}/dnf %{_bindir}/dnf
%{_bindir}/dnf-automatic %{_bindir}/dnf-automatic
%{_bindir}/dnf-2 %{_bindir}/dnf-3
%{_bindir}/dnf-automatic-2 %{_bindir}/dnf-automatic-3
%dir %{python_sitearch}/dnf %dir %{python3_sitearch}/dnf
%{python_sitearch}/dnf/* %{python3_sitearch}/dnf/*
%{_unitdir}/dnf-automatic-download.service %{_unitdir}/dnf-automatic-download.service
%{_unitdir}/dnf-automatic-download.timer %{_unitdir}/dnf-automatic-download.timer
%{_unitdir}/dnf-automatic-install.service %{_unitdir}/dnf-automatic-install.service
@ -176,6 +178,21 @@ mkdir -p %{buildroot}%{_sysconfdir}/yum
%{_mandir}/man8/yum.8* %{_mandir}/man8/yum.8*
%changelog %changelog
* Sat Aug 15 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 4.2.23-3mamba
- fix requirements with python3
* Fri Aug 14 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 4.2.23-2mamba
- rebuilt with python3
* Tue Jun 02 2020 Automatic Build System <autodist@mambasoft.it> 4.2.23-1mamba
- automatic version update by autodist
* Wed Apr 01 2020 Automatic Build System <autodist@mambasoft.it> 4.2.21-1mamba
- automatic version update by autodist
* Mon Feb 24 2020 Automatic Build System <autodist@mambasoft.it> 4.2.19-1mamba
- automatic version update by autodist
* Thu Jan 16 2020 Automatic Build System <autodist@mambasoft.it> 4.2.18-1mamba * Thu Jan 16 2020 Automatic Build System <autodist@mambasoft.it> 4.2.18-1mamba
- automatic version update by autodist - automatic version update by autodist