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

Jump to bottom

chore: Clean up Fedora 37-related conditionals in RPM spec #1765

Merged
merged 1 commit into from
Oct 18, 2024
Merged

chore: Clean up Fedora 37-related conditionals in RPM spec #1765

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 3 additions & 6 deletions dnf5.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ Recommends: (dnf5-plugins if dnf-plugins-core)
Recommends: bash-completion
Requires: coreutils

# Remove if condition when Fedora 37 is EOL
%if 0%{?fedora} > 37 || 0%{?rhel} > 10
%if 0%{?fedora} || 0%{?rhel} > 10
Provides: microdnf = %{version}-%{release}
Obsoletes: microdnf < 4
%endif
Expand Down Expand Up @@ -271,8 +270,7 @@ It supports RPM packages, modulemd modules, and comps groups & environments.
%{_bindir}/yum
%endif

# Remove if condition when Fedora 37 is EOL
%if 0%{?fedora} > 37 || 0%{?rhel} > 10
%if 0%{?fedora} || 0%{?rhel} > 10
%{_bindir}/microdnf
%endif

Expand Down Expand Up @@ -857,8 +855,7 @@ mkdir -p %{buildroot}%{_prefix}/lib/sysimage/libdnf5/comps_groups
mkdir -p %{buildroot}%{_prefix}/lib/sysimage/libdnf5/offline
touch %{buildroot}%{_sysconfdir}/dnf/versionlock.toml

# Remove if condition when Fedora 37 is EOL
%if 0%{?fedora} > 37 || 0%{?rhel} > 10
%if 0%{?fedora} || 0%{?rhel} > 10
ln -sr %{buildroot}%{_bindir}/dnf5 %{buildroot}%{_bindir}/microdnf
%endif

Expand Down
Loading