mirror of
https://github.com/xcat2/xcat-core.git
synced 2026-08-03 07:57:00 +00:00
fix(xcat-core): drop RHEL-only perl build deps on SUSE
The perl-xCAT component specs BuildRequire perl-Pod-Html and (in
xCAT-client) perl-generators, neither of which exists on openSUSE/SLES,
so rpmbuild aborts at dependency resolution before the build can start.
perl-generators is a RHEL/Fedora-only helper that emits perl dependency
metadata; SUSE's rpm generates those itself. Pod::Html ships inside the
core perl package on SUSE, with no separate perl-Pod-Html subpackage to
require. Guard both BuildRequires with %if !0%{?suse_version} so the SUSE
build resolves while EL/Fedora builds are unchanged.
Signed-off-by: Daniel Hilst <392820+dhilst@users.noreply.github.com>
(cherry picked from commit 4b24558835)
This commit is contained in:
committed by
Vinícius Ferrão
parent
2f572b49a6
commit
2bfd004058
@@ -20,7 +20,10 @@ BuildArch: noarch
|
||||
Provides: xCAT-OpenStack-baremetal = %{epoch}:%{version}
|
||||
|
||||
Requires: xCAT-client
|
||||
# Pod::Html ships inside the core perl package on SUSE; there is no perl-Pod-Html
|
||||
%if !0%{?suse_version}
|
||||
BuildRequires: perl-Pod-Html
|
||||
%endif
|
||||
|
||||
%description
|
||||
xCAT-OpenStack-baremetal provides the baremetal driver for OpenStack.
|
||||
|
||||
@@ -15,7 +15,10 @@ BuildRoot: /var/tmp/%{name}-%{version}-%{release}-root
|
||||
BuildArch: noarch
|
||||
%endif
|
||||
Requires: xCAT-server
|
||||
# Pod::Html ships inside the core perl package on SUSE; there is no perl-Pod-Html
|
||||
%if !0%{?suse_version}
|
||||
BuildRequires: perl-Pod-Html
|
||||
%endif
|
||||
|
||||
# perl-ExtUtils-MakeMaker, perl-CPAN, perl-Test-Harness are only available in rhel.
|
||||
# When this rpm supports being installed in sles, need to add these to xcat-dep.
|
||||
|
||||
@@ -12,7 +12,10 @@ Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
|
||||
Prefix: /opt/xcat
|
||||
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
|
||||
%endif
|
||||
|
||||
#%ifnos linux
|
||||
AutoReqProv: no
|
||||
|
||||
@@ -19,7 +19,10 @@ BuildRoot: /var/tmp/%{name}-%{version}-%{release}-root
|
||||
%define s390x %(if [ "$s390x" = "1" ];then echo 1; else echo 0; fi)
|
||||
%define nots390x %(if [ "$s390x" = "1" ];then echo 0; else echo 1; fi)
|
||||
|
||||
# Pod::Html ships inside the core perl package on SUSE; there is no perl-Pod-Html
|
||||
%if !0%{?suse_version}
|
||||
BuildRequires: perl-Pod-Html
|
||||
%endif
|
||||
|
||||
# AIX will build with an arch of "ppc"
|
||||
%ifos linux
|
||||
@@ -31,7 +34,10 @@ Requires: cpio
|
||||
|
||||
# fping or nmap is needed by pping (in case xCAT-client is installed by itself on a remote client)
|
||||
%ifos linux
|
||||
# perl-generators is a RHEL/Fedora-only build helper; SUSE generates perl deps itself
|
||||
%if !0%{?suse_version}
|
||||
BuildRequires: perl-generators
|
||||
%endif
|
||||
Requires: nmap perl-XML-Simple perl-XML-Parser
|
||||
%else
|
||||
Requires: expat
|
||||
|
||||
@@ -17,7 +17,10 @@ BuildArch: noarch
|
||||
Requires: confluent_server
|
||||
|
||||
Provides: xCAT-confluent = %{epoch}:%{version}
|
||||
# Pod::Html ships inside the core perl package on SUSE; there is no perl-Pod-Html
|
||||
%if !0%{?suse_version}
|
||||
BuildRequires: perl-Pod-Html
|
||||
%endif
|
||||
|
||||
%description
|
||||
xCAT confluent provides the necessary integration pieces to utilize the confluent
|
||||
|
||||
@@ -11,7 +11,10 @@ Vendor: IBM Corp.
|
||||
Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
|
||||
Prefix: /opt/xcat
|
||||
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
|
||||
%endif
|
||||
|
||||
# AIX will build with an arch of "ppc"
|
||||
%ifos linux
|
||||
|
||||
@@ -11,7 +11,10 @@ Vendor: IBM Corp.
|
||||
Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
|
||||
Prefix: /opt/xcat
|
||||
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
|
||||
%endif
|
||||
|
||||
%ifos linux
|
||||
BuildArch: noarch
|
||||
|
||||
Reference in New Issue
Block a user