Fix the conditionals for 'if RHEL <= 9'

'%if 0%{?rhel} <= 9' is the wrong way to express 'if RHEL <= 9'.  On
Fedora, %rhel won't be defined.  So, %{?rhel} will expand to nothing,
and leave only a 0 on the left hand side, making the condition TRUE on
Fedora.

Note, that conditions like '%if 0%{?rhel}', and other relational
operators like ==, > and >= work as expected.  The problem is only with
< and <=.

Fallout from 1d18729e66 and
d437e83604
This commit is contained in:
Debarshi Ray 2023-12-05 15:14:49 +01:00
parent e7a1de731b
commit 8fd7877f42

View File

@ -5,13 +5,19 @@ Version: 0.0.99.4
%global goipath github.com/containers/%{name} %global goipath github.com/containers/%{name}
%if 0%{?fedora}
%gometa -f
%endif
%if 0%{?rhel}
%if 0%{?rhel} <= 9 %if 0%{?rhel} <= 9
%gometa %gometa
%else %else
%gometa -f %gometa -f
%endif %endif
%endif
Release: 7%{?dist} Release: 8%{?dist}
Summary: Tool for containerized command line environments on Linux Summary: Tool for containerized command line environments on Linux
License: ASL 2.0 License: ASL 2.0
@ -224,9 +230,11 @@ export CGO_CFLAGS="%{optflags} -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_
%install %install
%meson_install %meson_install
%if 0%{?rhel}
%if 0%{?rhel} <= 9 %if 0%{?rhel} <= 9
install -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/containers/%{name}.conf install -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/containers/%{name}.conf
%endif %endif
%endif
%files %files
@ -256,6 +264,9 @@ install -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/containers/%{name}.conf
%changelog %changelog
* Tue Dec 05 2023 Debarshi Ray <rishi@fedoraproject.org> - 0.0.99.4-8
- Fix the conditionals for 'if RHEL <= 9'
* Thu Nov 30 2023 Debarshi Ray <rishi@fedoraproject.org> - 0.0.99.4-7 * Thu Nov 30 2023 Debarshi Ray <rishi@fedoraproject.org> - 0.0.99.4-7
- Track the active container on Fedora Linux Asahi Remix - Track the active container on Fedora Linux Asahi Remix