From 2bfd004058b36fa33515354eed8542e5fd8e15a8 Mon Sep 17 00:00:00 2001
From: Daniel Hilst <392820+dhilst@users.noreply.github.com>
Date: Mon, 29 Jun 2026 07:36:52 -0300
Subject: [PATCH] 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 4b24558835719c9fddff1e7c00d1eb5cde744e45)
---
 xCAT-OpenStack-baremetal/xCAT-OpenStack-baremetal.spec | 3 +++
 xCAT-SoftLayer/xCAT-SoftLayer.spec                     | 3 +++
 xCAT-buildkit/xCAT-buildkit.spec                       | 3 +++
 xCAT-client/xCAT-client.spec                           | 6 ++++++
 xCAT-confluent/xCAT-confluent.spec                     | 3 +++
 xCAT-test/xCAT-test.spec                               | 3 +++
 xCAT-vlan/xCAT-vlan.spec                               | 3 +++
 7 files changed, 24 insertions(+)

diff --git a/xCAT-OpenStack-baremetal/xCAT-OpenStack-baremetal.spec b/xCAT-OpenStack-baremetal/xCAT-OpenStack-baremetal.spec
index 0a38609de..71fa9b96b 100644
--- a/xCAT-OpenStack-baremetal/xCAT-OpenStack-baremetal.spec
+++ b/xCAT-OpenStack-baremetal/xCAT-OpenStack-baremetal.spec
@@ -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.
diff --git a/xCAT-SoftLayer/xCAT-SoftLayer.spec b/xCAT-SoftLayer/xCAT-SoftLayer.spec
index 0991a419c..a2355ddba 100644
--- a/xCAT-SoftLayer/xCAT-SoftLayer.spec
+++ b/xCAT-SoftLayer/xCAT-SoftLayer.spec
@@ -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.
diff --git a/xCAT-buildkit/xCAT-buildkit.spec b/xCAT-buildkit/xCAT-buildkit.spec
index 037dfcfc4..4bc6d948b 100644
--- a/xCAT-buildkit/xCAT-buildkit.spec
+++ b/xCAT-buildkit/xCAT-buildkit.spec
@@ -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
diff --git a/xCAT-client/xCAT-client.spec b/xCAT-client/xCAT-client.spec
index b35349324..0fc3e717f 100644
--- a/xCAT-client/xCAT-client.spec
+++ b/xCAT-client/xCAT-client.spec
@@ -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
diff --git a/xCAT-confluent/xCAT-confluent.spec b/xCAT-confluent/xCAT-confluent.spec
index b0bf55e48..9a940fb30 100644
--- a/xCAT-confluent/xCAT-confluent.spec
+++ b/xCAT-confluent/xCAT-confluent.spec
@@ -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
diff --git a/xCAT-test/xCAT-test.spec b/xCAT-test/xCAT-test.spec
index ed97a2d0d..d4f759221 100644
--- a/xCAT-test/xCAT-test.spec
+++ b/xCAT-test/xCAT-test.spec
@@ -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
diff --git a/xCAT-vlan/xCAT-vlan.spec b/xCAT-vlan/xCAT-vlan.spec
index 69e3c5cbe..883f714d1 100644
--- a/xCAT-vlan/xCAT-vlan.spec
+++ b/xCAT-vlan/xCAT-vlan.spec
@@ -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