diff --git a/makexcatrpm b/makexcatrpm index afc8b8f53..2692a06c8 100755 --- a/makexcatrpm +++ b/makexcatrpm @@ -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 diff --git a/xCAT/xCAT.spec b/xCAT/xCAT.spec index c0151670f..664b5f74c 100644 --- a/xCAT/xCAT.spec +++ b/xCAT/xCAT.spec @@ -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) - diff --git a/xCATsn/xCATsn.spec b/xCATsn/xCATsn.spec index 66c8addbb..89e642585 100644 --- a/xCATsn/xCATsn.spec +++ b/xCATsn/xCATsn.spec @@ -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)