X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Monitor.spec;h=87c0e629df0cb6e574dd8a21300892f862946238;hb=96d9a3873c32ddbf89aca0d5fb09b77fe92b16fc;hp=ab857c525c3ee169a64ebed56dee7feb14791f65;hpb=94319ffe3d7ef2fb2e4b74ae7e8521004969f49c;p=monitor.git

diff --git a/Monitor.spec b/Monitor.spec
index ab857c5..87c0e62 100644
--- a/Monitor.spec
+++ b/Monitor.spec
@@ -77,7 +77,7 @@ as Zabbix DB.
 %build
 # NOTE: the build uses g++ cmdamt/
 # NOTE: TMPDIR is needed here b/c the tmpfs of the build vserver is too small.
-cd cmdamt
+cd pcucontrol/models/intelamt
 export TMPDIR=$PWD/tmp
 make
 cd ..
@@ -117,6 +117,7 @@ rsync -a monitor/ $RPM_BUILD_ROOT/%{python_sitearch}/monitor/
 #for file in __init__.py database.py config.py ; do 
 #	install -D -m 644 monitor/$file $RPM_BUILD_ROOT/%{python_sitearch}/monitor/$file
 #done
+rsync -a pcucontrol/ $RPM_BUILD_ROOT/%{python_sitearch}/pcucontrol/
 install -D -m 755 threadpool.py $RPM_BUILD_ROOT/%{python_sitearch}/threadpool.py
 
 touch $RPM_BUILD_ROOT/var/www/cgi-bin/monitor/monitorconfig.php
@@ -131,7 +132,7 @@ rm -rf $RPM_BUILD_ROOT
 %files server
 %defattr(-,root,root)
 #%config /usr/share/%{name}/monitorconfig.py
-%config /etc/monitor.conf
+#%config /etc/monitor.conf
 /usr/share/%{name}
 /var/lib/%{name}
 /var/www/cgi-bin/monitor
@@ -140,6 +141,7 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/threadpool.pyc
 %{python_sitearch}/threadpool.pyo
 %{python_sitearch}/monitor
+%{python_sitearch}/pcucontrol
 %{_sysconfdir}/plc.d/monitor
 
 %files client
@@ -152,7 +154,7 @@ rm -rf $RPM_BUILD_ROOT
 # 		an API server or so on.
 # TODO: create real monitorconfig.py from monitorconfig-default.py
 # TODO: create monitorconfig.php using phpconfig.py 
-# TODO: create symlink in /var/lib/monitor-server for chroot environments
+# TODO: create symlink in /var/lib/monitor for chroot environments
 # TODO: update the content of automate_pl03.sh 
 # TODO: Use the installed version of bootcd to create custom boot images. ( or, use the api now).