Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix /var/cache/dnf and /etc/yum packaging #2118

Merged
merged 4 commits into from
Aug 19, 2024
Merged

Fix /var/cache/dnf and /etc/yum packaging #2118

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
69180a5
spec: Move /var/cache/dnf from dnf to python3-dnf
ppisar Aug 13, 2024
f89f14e
spec: Remove preview yum_compat_level
ppisar Aug 13, 2024
65a19c6
spec: Simplify %files dnf section for both yum_compat_levels
ppisar Aug 13, 2024
e053f85
spec: Fix ownership of /etc/yum tree
ppisar Aug 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 4 additions & 22 deletions dnf.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
# level=full -> deploy all compat symlinks (conflicts with yum < 4)
# level=minimal -> deploy a subset of compat symlinks only
# (no conflict with yum >= 3.4.3-505)*
# level=preview -> minimal level with altered paths (no conflict with yum < 4)
# *release 505 renamed /usr/bin/yum to /usr/bin/yum-deprecated
%global yum_compat_level full
%global yum_subpackage_name yum
Expand All @@ -48,7 +47,6 @@
%endif
%endif
%if 0%{?rhel} && 0%{?rhel} <= 7
%global yum_compat_level preview
%global yum_subpackage_name nextgen-yum4
%endif

Expand Down Expand Up @@ -301,7 +299,6 @@ popd
%{_mandir}/man5/dnf-transaction-json.5*
%{_unitdir}/%{name}-makecache.service
%{_unitdir}/%{name}-makecache.timer
%{_var}/cache/%{name}/

%files data
%license COPYING PACKAGE-LICENSING
Expand Down Expand Up @@ -337,13 +334,11 @@ popd
%{_tmpfilesdir}/%{name}.conf

%files -n %{yum_subpackage_name}
%if "%{yum_compat_level}" == "full"
%{_bindir}/yum
%{_sysconfdir}/yum.conf
%{_sysconfdir}/yum/pluginconf.d
%{_sysconfdir}/yum/protected.d
%{_sysconfdir}/yum/vars
%{_mandir}/man8/yum.8*
%if "%{yum_compat_level}" == "full"
%{_sysconfdir}/yum
%{_sysconfdir}/yum.conf
%{_mandir}/man5/yum.conf.5.*
%{_mandir}/man8/yum-shell.8*
%{_mandir}/man1/yum-aliases.1*
Expand All @@ -359,26 +354,12 @@ popd
%endif
%else
%exclude %{_sysconfdir}/yum.conf
%exclude %{_sysconfdir}/yum/pluginconf.d
%exclude %{_sysconfdir}/yum/protected.d
%exclude %{_sysconfdir}/yum/vars
%exclude %{confdir}/protected.d/yum.conf
%exclude %{_mandir}/man5/yum.conf.5.*
%exclude %{_mandir}/man8/yum-shell.8*
%exclude %{_mandir}/man1/yum-aliases.1*
%endif

%if "%{yum_compat_level}" == "minimal"
%{_bindir}/yum
%{_mandir}/man8/yum.8*
%endif

%if "%{yum_compat_level}" == "preview"
%{_bindir}/yum4
%{_mandir}/man8/yum4.8*
%exclude %{_mandir}/man8/yum.8*
%endif

%files -n python3-%{name}
%{_bindir}/%{name}-3
%{_bindir}/%{name}4
Expand All @@ -394,6 +375,7 @@ popd
%{python3_sitelib}/%{name}/
%dir %{py3pluginpath}
%dir %{py3pluginpath}/__pycache__
%{_var}/cache/%{name}/

%files automatic
%{_bindir}/%{name}-automatic
Expand Down
Loading