From 2c89d9d93a42d612c2b0c8855ecef5d42f467302 Mon Sep 17 00:00:00 2001 From: bp-sawyers Date: Tue, 20 Mar 2012 15:50:48 +0000 Subject: [PATCH] Have the xCAT rpms require the more specific version of perl-xCAT (e.g. 2.7.1 instead of 2.7) git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/branches/2.7@11913 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-IBMhpc/xCAT-IBMhpc.spec | 2 +- xCAT-client/xCAT-client.spec | 2 ++ xCAT-rmc/xCAT-rmc.spec | 2 +- xCAT-server/xCAT-server.spec | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/xCAT-IBMhpc/xCAT-IBMhpc.spec b/xCAT-IBMhpc/xCAT-IBMhpc.spec index c7886b1e4..284b5ce4b 100644 --- a/xCAT-IBMhpc/xCAT-IBMhpc.spec +++ b/xCAT-IBMhpc/xCAT-IBMhpc.spec @@ -23,7 +23,7 @@ BuildArch: noarch #Requires: %endif -Requires: perl-xCAT >= %{epoch}:%(cat Version|cut -d. -f 1,2) +Requires: perl-xCAT >= %{epoch}:%(cat Version) Requires: xCAT-client >= %{epoch}:%(cat Version|cut -d. -f 1,2) Provides: xCAT-IBMhpc = %{epoch}:%{version} diff --git a/xCAT-client/xCAT-client.spec b/xCAT-client/xCAT-client.spec index 267242dae..4ce5bbd1b 100644 --- a/xCAT-client/xCAT-client.spec +++ b/xCAT-client/xCAT-client.spec @@ -19,6 +19,8 @@ BuildArch: noarch Provides: xCAT-client = %{epoch}:%{version} +Requires: perl-xCAT >= %{epoch}:%(cat Version) + # fping or nmap is needed by pping (in case xCAT-client is installed by itself on a remote client) %ifos linux Requires: nmap diff --git a/xCAT-rmc/xCAT-rmc.spec b/xCAT-rmc/xCAT-rmc.spec index 442c29983..fa413d801 100644 --- a/xCAT-rmc/xCAT-rmc.spec +++ b/xCAT-rmc/xCAT-rmc.spec @@ -15,7 +15,7 @@ BuildRoot: /var/tmp/%{name}-%{version}-%{release}-root BuildArch: noarch %endif -Requires: perl-xCAT >= %{epoch}:%(cat Version|cut -d. -f 1,2) +Requires: perl-xCAT >= %{epoch}:%(cat Version) Requires: xCAT-server >= %{epoch}:%(cat Version|cut -d. -f 1,2) Provides: xCAT-rmc = %{version} diff --git a/xCAT-server/xCAT-server.spec b/xCAT-server/xCAT-server.spec index a045037b6..b872a75d7 100644 --- a/xCAT-server/xCAT-server.spec +++ b/xCAT-server/xCAT-server.spec @@ -24,7 +24,7 @@ Requires: perl-IO-Socket-SSL perl-XML-Simple perl-IO-Tty perl-Crypt-SSLeay make Obsoletes: atftp-xcat %endif -Requires: perl-xCAT >= %{epoch}:%(cat Version|cut -d. -f 1,2) +Requires: perl-xCAT >= %{epoch}:%(cat Version) Requires: xCAT-client >= %{epoch}:%(cat Version|cut -d. -f 1,2) Provides: xCAT-server = %{epoch}:%{version}