install xCATMN with xCAT metapackage so will be removed on erase

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@5035 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
lissav 2010-01-25 13:41:46 +00:00
parent 650c20fc5d
commit 85b0e9aa17
3 changed files with 8 additions and 1 deletions

View File

@ -17,6 +17,7 @@ then
gzip -f /opt/freeware/src/packages/SOURCES/templates.tar
cp xcat.conf /opt/freeware/src/packages/SOURCES
cp xCATMN /opt/freeware/src/packages/SOURCES
rm -f /opt/freeware/src/packages/SRPMS/xCAT-$VER*rpm /opt/freeware/src/packages/RPMS/ppc/xCAT-$VER*rpm
cd -
@ -38,6 +39,7 @@ else
tar --exclude .svn -czf /usr/src/$pkg/SOURCES/prescripts.tar.gz prescripts
tar --exclude .svn -czf /usr/src/$pkg/SOURCES/templates.tar.gz templates
cp xcat.conf /usr/src/$pkg/SOURCES
cp xCATMN /usr/src/$pkg/SOURCES
cd -
rm -f /usr/src/$pkg/SRPMS/xCAT-$VER*rpm /usr/src/$pkg/RPMS/*/xCAT-$VER*rpm
if [ ! -z "$1" ]; then

View File

@ -13,6 +13,7 @@ BuildRoot: /var/tmp/%{name}-%{version}-%{release}-root
Source1: xcat.conf
Source2: postscripts.tar.gz
Source3: templates.tar.gz
Source5: xCATMN
%ifos linux
Source4: prescripts.tar.gz
@ -95,6 +96,7 @@ mkdir -p postscripts/hostkeys
cd -
cp %{SOURCE1} $RPM_BUILD_ROOT/etc/apache2/conf.d/xcat.conf
cp %{SOURCE1} $RPM_BUILD_ROOT/etc/httpd/conf.d/xcat.conf
cp %{SOURCE5} $RPM_BUILD_ROOT/etc/xCATMN
mkdir -p $RPM_BUILD_ROOT/%{prefix}/share/doc/packages/xCAT
cp LICENSE.html $RPM_BUILD_ROOT/%{prefix}/share/doc/packages/xCAT
@ -117,7 +119,7 @@ fi
# one for sles, one for rhel. yes, it's ugly...
/etc/httpd/conf.d/xcat.conf
/etc/apache2/conf.d/xcat.conf
/etc/xCATMN
/install/postscripts
/install/prescripts
%defattr(-,root,root)

View File

@ -13,6 +13,7 @@ BuildRoot: /var/tmp/%{name}-%{version}-%{release}-root
#BuildArch: noarch
Source1: xcat.conf
Source2: license.tar.gz
Source3: xCATSN
Provides: xCATsn = %{version}
Requires: xCAT-server xCAT-client perl-xCAT perl-XML-Parser
Conflicts: xCAT-2
@ -58,6 +59,7 @@ mkdir -p $RPM_BUILD_ROOT/%{prefix}/share/xcat/
# cd -
cp %{SOURCE1} $RPM_BUILD_ROOT/etc/apache2/conf.d/xcat.conf
cp %{SOURCE1} $RPM_BUILD_ROOT/etc/httpd/conf.d/xcat.conf
cp %{SOURCE3} $RPM_BUILD_ROOT/etc/xCATSN
mkdir -p $RPM_BUILD_ROOT/%{prefix}/share/doc/packages/xCAT
cp LICENSE.html $RPM_BUILD_ROOT/%{prefix}/share/doc/packages/xCAT
@ -94,4 +96,5 @@ fi
# one for sles, one for rhel. yes, it's ugly...
/etc/httpd/conf.d/xcat.conf
/etc/apache2/conf.d/xcat.conf
/etc/xCATSN
%defattr(-,root,root)