mirror of
https://github.com/xcat2/xcat-core.git
synced 2026-11-19 17:02:15 +00:00
fix(packaging): four packages cannot build on openSUSE
xCAT-buildkit, xCAT-client, xCAT-test and xCAT-vlan failed in %build with
"pod2man: command not found", and buildrpms.pl then refused to index a partial
repository, so there is no openSUSE core repo to install from at all.
An openSUSE build root installs only perl-base, which does not ship pod2man, and
xpod2man runs it. The four specs guarded "BuildRequires: perl-Pod-Html" with
"%if !0%{?suse_version}" and declared nothing in its place, so openSUSE had no
requirement that brings the tool in. They now require the full perl package there.
This is not an IPv6 defect. xCAT-vlan and xCAT-buildkit carry no change on this
branch and fail the same way, so the gap predates it; it is fixed here because it
stands between the branch and any openSUSE test.
Signed-off-by: Daniel Hilst <392820+dhilst@users.noreply.github.com>
This commit is contained in:
@@ -15,6 +15,10 @@ BuildRoot: /var/tmp/%{name}-%{version}-%{release}-root
|
||||
# Pod::Html ships inside the core perl package on SUSE; there is no perl-Pod-Html
|
||||
%if !0%{?suse_version}
|
||||
BuildRequires: perl-Pod-Html
|
||||
%else
|
||||
# openSUSE installs only perl-base in a build root, and perl-base does not ship pod2man,
|
||||
# which xpod2man runs to build the man pages. The full perl package carries it.
|
||||
BuildRequires: perl
|
||||
%endif
|
||||
|
||||
#%ifnos linux
|
||||
|
||||
@@ -22,6 +22,10 @@ BuildRoot: /var/tmp/%{name}-%{version}-%{release}-root
|
||||
# Pod::Html ships inside the core perl package on SUSE; there is no perl-Pod-Html
|
||||
%if !0%{?suse_version}
|
||||
BuildRequires: perl-Pod-Html
|
||||
%else
|
||||
# openSUSE installs only perl-base in a build root, and perl-base does not ship pod2man,
|
||||
# which xpod2man runs to build the man pages. The full perl package carries it.
|
||||
BuildRequires: perl
|
||||
%endif
|
||||
|
||||
# AIX will build with an arch of "ppc"
|
||||
|
||||
@@ -14,6 +14,10 @@ BuildRoot: /var/tmp/%{name}-%{version}-%{release}-root
|
||||
# Pod::Html ships inside the core perl package on SUSE; there is no perl-Pod-Html
|
||||
%if !0%{?suse_version}
|
||||
BuildRequires: perl-Pod-Html
|
||||
%else
|
||||
# openSUSE installs only perl-base in a build root, and perl-base does not ship pod2man,
|
||||
# which xpod2man runs to build the man pages. The full perl package carries it.
|
||||
BuildRequires: perl
|
||||
%endif
|
||||
|
||||
# AIX will build with an arch of "ppc"
|
||||
|
||||
@@ -14,6 +14,10 @@ BuildRoot: /var/tmp/%{name}-%{version}-%{release}-root
|
||||
# Pod::Html ships inside the core perl package on SUSE; there is no perl-Pod-Html
|
||||
%if !0%{?suse_version}
|
||||
BuildRequires: perl-Pod-Html
|
||||
%else
|
||||
# openSUSE installs only perl-base in a build root, and perl-base does not ship pod2man,
|
||||
# which xpod2man runs to build the man pages. The full perl package carries it.
|
||||
BuildRequires: perl
|
||||
%endif
|
||||
|
||||
%ifos linux
|
||||
|
||||
Reference in New Issue
Block a user