diff --git a/dnf.spec b/dnf.spec index abf2dc2ec25d497e8e4e3ef723a95eac5a17ae78..f95968ae9b18728637a4e29f7e7c2d986f8021cb 100644 --- a/dnf.spec +++ b/dnf.spec @@ -1,9 +1,10 @@ +%undefine __cmake_in_source_build %global py3pluginpath %{python3_sitelib}/%{name}-plugins %global relate_libdnf_version 0.66.0 Name: dnf Version: 4.16.2 -Release: 8 +Release: 9 Summary: A software package manager that manages packages on Linux distributions. License: GPL-2.0-or-later AND GPL-1.0-only URL: https://github.com/rpm-software-management/dnf @@ -38,6 +39,7 @@ Patch9001: bugfix-automatic-Use-add_security_filters-not-_update_secu BuildArch: noarch BuildRequires: cmake gettext systemd bash-completion python3-sphinx Requires: python3-%{name} = %{version}-%{release} libreport-filesystem +%{?systemd_requires} Recommends: (%{_bindir}/sqlite3 if bash-completion) (python3-dbus if NetworkManager) Conflicts: python2-dnf-plugins-core < 4.0.6 python3-dnf-plugins-core < 4.0.6 @@ -107,7 +109,6 @@ Man pages and other related documents for dnf and yum %prep %autosetup -p1 -mkdir build-py3 #Failure use case #It not have root permissions in obs @@ -117,15 +118,12 @@ sed -i '168,174d' tests/api/test_dnf_base.py sed -i '51,55d' tests/api/test_dnf_logging.py %build -pushd build-py3 -%cmake .. -DPYTHON_DESIRED:FILEPATH=%{__python3} -%make_build all doc-man -popd +%cmake -DPYTHON_DESIRED:FILEPATH=%{__python3} +%cmake_build +%cmake_build --target doc-man %install -pushd build-py3 -%make_install -popd +%cmake_install %find_lang %{name} mkdir -p %{buildroot}%{_sysconfdir}/%{name}/vars @@ -152,9 +150,7 @@ ln -sr %{buildroot}%{_sysconfdir}/%{name}/vars %{buildroot}%{_sysconfdir}/yum/v %check export TERM=linux -pushd build-py3 -ctest -VV -popd +%ctest -VV %post %systemd_post dnf-makecache.timer @@ -261,6 +257,9 @@ popd %{_mandir}/man8/%{name}-automatic.8* %changelog +* Fri Dec 20 2024 Funda Wang - 4.16.2-9 +- adopt to new cmake macro + * Mon Nov 04 2024 majianhan - 4.16.2-8 - Type:bugfix - ID:NA