From d064e984b78f73c53ab932a0208bfa9a73bf8d0a Mon Sep 17 00:00:00 2001 From: jbjohnso Date: Thu, 21 Jun 2012 19:46:19 +0000 Subject: [PATCH] More FSM exclusions git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@13146 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server/xCAT-server.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/xCAT-server/xCAT-server.spec b/xCAT-server/xCAT-server.spec index edf342a6b..ae3cc97e6 100644 --- a/xCAT-server/xCAT-server.spec +++ b/xCAT-server/xCAT-server.spec @@ -264,11 +264,14 @@ mkdir -p $RPM_BUILD_ROOT/%{prefix}/ws mkdir -p $RPM_BUILD_ROOT/etc/apache2/conf.d mkdir -p $RPM_BUILD_ROOT/etc/httpd/conf.d cp xCAT-wsapi/* $RPM_BUILD_ROOT/%{prefix}/ws +%if %fsm +%else echo "ScriptAlias /xcatws %{prefix}/ws/xcatws.cgi" > $RPM_BUILD_ROOT/etc/apache2/conf.d/xcat-ws.conf cat $RPM_BUILD_ROOT/%{prefix}/ws/xcat-ws.conf.apache2 >> $RPM_BUILD_ROOT/etc/apache2/conf.d/xcat-ws.conf echo "ScriptAlias /xcatws %{prefix}/ws/xcatws.cgi" > $RPM_BUILD_ROOT/etc/httpd/conf.d/xcat-ws.conf cat $RPM_BUILD_ROOT/%{prefix}/ws/xcat-ws.conf.httpd >> $RPM_BUILD_ROOT/etc/httpd/conf.d/xcat-ws.conf +%endif rm -f $RPM_BUILD_ROOT/%{prefix}/ws/xcat-ws.conf.apache2 rm -f $RPM_BUILD_ROOT/%{prefix}/ws/xcat-ws.conf.httpd @@ -281,8 +284,11 @@ rm -rf $RPM_BUILD_ROOT %{prefix} /etc/xcat /etc/init.d/xcatd +%if %fsm +%else /etc/apache2/conf.d/xcat-ws.conf /etc/httpd/conf.d/xcat-ws.conf +%endif %changelog * Fri Nov 20 2007 - Jarrod Johnson