From 5368829ded10b52392f4f8db06dc2ac45a2b1be8 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Thu, 18 Apr 2019 16:58:46 +0800 Subject: [PATCH 1/2] Remove conserver-xcat from RPM requirements --- xCAT/xCAT.spec | 10 ---------- xCATsn/xCATsn.spec | 10 ---------- 2 files changed, 20 deletions(-) diff --git a/xCAT/xCAT.spec b/xCAT/xCAT.spec index 1a1308820..f52bb3a90 100644 --- a/xCAT/xCAT.spec +++ b/xCAT/xCAT.spec @@ -63,16 +63,6 @@ Requires: perl-IO-Stty %endif %endif -# The aix rpm cmd forces us to do this outside of ifos type stmts -%if %notpcm -%ifos linux -%if %nots390x -# PCM does not use or ship conserver -Requires: conserver-xcat -%endif -%endif -%endif - %ifos linux Requires: goconserver %endif diff --git a/xCATsn/xCATsn.spec b/xCATsn/xCATsn.spec index 102218b0e..6e10a4756 100644 --- a/xCATsn/xCATsn.spec +++ b/xCATsn/xCATsn.spec @@ -46,16 +46,6 @@ Requires: perl-IO-Stty %endif %endif -# The aix rpm cmd forces us to do this outside of ifos type stmts -%if %notpcm -%ifos linux -%ifnarch s390x -# PCM does not use or ship conserver -Requires: conserver-xcat -%endif -%endif -%endif - %ifos linux Requires: goconserver %endif From c06f1a4213d0962ccfbd63c69ab39251e241c836 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Wed, 5 Dec 2018 16:05:49 +0800 Subject: [PATCH 2/2] Update xCAT-server.spec to require a new version of grub2-xcat --- xCAT-server/xCAT-server.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-server/xCAT-server.spec b/xCAT-server/xCAT-server.spec index e491c4927..85c4e3f2c 100644 --- a/xCAT-server/xCAT-server.spec +++ b/xCAT-server/xCAT-server.spec @@ -48,7 +48,7 @@ Obsoletes: atftp-xcat # # PCM does not use or ship grub2-xcat %if %nots390x -Requires: grub2-xcat perl-Net-HTTPS-NB perl-HTTP-Async +Requires: grub2-xcat >= 2.02-0.76 perl-Net-HTTPS-NB perl-HTTP-Async %endif %endif %endif