X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=monitor-server.spec;h=e6b5fac943a26ed1bfc55c5bbe3329681f777572;hb=944d143a6528c4157b71f51ed480aec806cbaa06;hp=2c800d237a79de787f2bbc7843c03f7e29eea804;hpb=89ea70205b043740317b8e67af62be8849b0239b;p=monitor.git

diff --git a/monitor-server.spec b/monitor-server.spec
index 2c800d2..e6b5fac 100644
--- a/monitor-server.spec
+++ b/monitor-server.spec
@@ -6,9 +6,11 @@
 
 %define name monitor-server
 %define version 1.0
-%define taglevel 5
+%define taglevel 6
 
 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
+%global python_sitearch	%( python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)" )
+
 
 Summary: Monitor backend scripts for server
 Name: %{name}
@@ -27,9 +29,12 @@ URL: %(echo %{url} | cut -d ' ' -f 2)
 Requires: curl
 Requires: coreutils
 Requires: openssh-clients
+Requires: perl-libwww-perl
+Requires: MySQL-python
+Requires: rt3 == 3.4.1
+
 Requires: PLCWWW >= 4.2
 Requires: BootCD >= 4.2
-Requires: MySQL-python
 
 %description
 Scripts for polling PLC, the node, and PCU status.  Also a collection of
@@ -40,7 +45,10 @@ command-line utilities for querying the status database.
 
 %build
 # TODO: note that we should build the cmdamt/ with g++
-echo "There is no build stage.  Simply copy files."
+cd cmdamt
+export TMPDIR=$PWD/tmp
+make
+cd ..
 
 %install
 
@@ -62,6 +70,11 @@ install -D -m 755 %{name}.cron $RPM_BUILD_ROOT/%{_sysconfdir}/cron.d/%{name}.cro
 echo " * TODO: Setting up Monitor account in local MyPLC"
 # TODO: 
 
+mkdir -p $RPM_BUILD_ROOT/%{python_sitearch}/%{name}
+install -D -m 755 monitor $RPM_BUILD_ROOT/%{python_sitearch}/%{name}
+install -D -m 755 threadpool.py $RPM_BUILD_ROOT/%{python_sitearch}/threadpool.py
+
+install -D -m 755 monitor-default.conf $RPM_BUILD_ROOT/etc/monitor.conf
 cp $RPM_BUILD_ROOT/usr/share/%{name}/monitorconfig-default.py $RPM_BUILD_ROOT/usr/share/%{name}/monitorconfig.py
 
 %clean
@@ -73,7 +86,9 @@ rm -rf $RPM_BUILD_ROOT
 /usr/share/%{name}
 /var/lib/%{name}
 /var/www/cgi-bin/monitor
-%{_sysconfdir}/cron.d/%{name}
+%{_sysconfdir}/cron.d/%{name}.cron
+%{python_sitearch}/threadpool.py
+%{python_sitearch}/%{name}
 
 %post
 echo "Post processing"
@@ -89,5 +104,9 @@ echo "Post processing"
 #chkconfig monitor-server on
 
 %changelog
+* Mon Aug 11 2008 Stephen Soltesz <soltesz@cs.princeton.edu> - Monitor-1.0-6
+- This is a major tag of every thing.  probably needs a very different release
+- number.
+
 * Wed Jul 30 2008 Stephen Soltesz <soltesz@cs.princeton.edu> - Monitor-server-1.0-5
 - initial creation of server-side package