mirror of
https://github.com/xcat2/xcat-core.git
synced 2026-11-21 09:52:17 +00:00
8cf1615b24
xCAT-buildkit, xCAT-client, xCAT-test and xCAT-vlan each hold two %else
in the pod converter BuildRequires block, so rpmbuild -bs stops with
"%else after %else" and the EL core build fails for every architecture
before it can index a repository.
The feat/ipv6 merge produced the structure. Both sides rewrite the same
%if block, master as "%if 0%{?suse_version}" and feat/ipv6 as the
inverted "%if !0%{?suse_version}", and they touch different lines, so
git merged both bodies without a conflict.
This change keeps master's form and removes the second branch. The two
branches ask for the same package on the same condition, so no
BuildRequires changes.
spec_conditional_nesting.t reports all four files before this change and
none after.
Signed-off-by: Daniel Hilst <392820+dhilst@users.noreply.github.com>