From a0f2a9a9930151d3be73471fe5e2a5663c95b1a8 Mon Sep 17 00:00:00 2001 From: phamt Date: Tue, 24 Apr 2012 15:24:16 +0000 Subject: [PATCH] Fixed bug #3458318 git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@12327 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-UI/xCAT-UI.spec | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/xCAT-UI/xCAT-UI.spec b/xCAT-UI/xCAT-UI.spec index 5c8c029c2..00a083211 100644 --- a/xCAT-UI/xCAT-UI.spec +++ b/xCAT-UI/xCAT-UI.spec @@ -82,6 +82,14 @@ mkdir -p $RPM_BUILD_ROOT%{prefix}/ui cp -r * $RPM_BUILD_ROOT%{prefix}/ui chmod 755 $RPM_BUILD_ROOT%{prefix}/ui/* +# Copy over xCAT UI plugins +cp xcat/plugins/*.pm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin +chmod 644 $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/web.pm +chmod 644 $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/webportal.pm + +# Create symbolic link to webportal command +ln -sf ../bin/xcatclientnnr $RPM_BUILD_ROOT/%{prefix}/bin/webportal + %files %defattr(-,root,root) %{prefix}/ui @@ -142,9 +150,9 @@ chmod 755 $RPM_BUILD_ROOT%{prefix}/ui/* if [ "$1" = 1 ] || [ "$1" = 2 ] # Install or upgrade then # Copy xCAT plugins to /opt/xcat/lib/perl/xCAT_plugin - cp %{prefix}/ui/xcat/plugins/web.pm %{prefix}/lib/perl/xCAT_plugin/ - cp %{prefix}/ui/xcat/plugins/webportal.pm %{prefix}/lib/perl/xCAT_plugin/ - /bin/ln -s ../bin/xcatclientnnr ../bin/webportal + # cp %{prefix}/ui/xcat/plugins/web.pm %{prefix}/lib/perl/xCAT_plugin/ + # cp %{prefix}/ui/xcat/plugins/webportal.pm %{prefix}/lib/perl/xCAT_plugin/ + # /bin/ln -s ../bin/xcatclientnnr ../bin/webportal /etc/init.d/xcatd restart # Copy php.ini file into /opt/xcat/ui and turn off output_buffering