X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=monitor-server.spec;h=0576459682b0362fa8172393fb395084ae783053;hb=8f6b4b6da6523023c43acc8ee8feeffe56250aae;hp=2071763d1546c60b1f6e907870e63935ecbd6a60;hpb=3d62cba44f092600d403cab0032d593e1e9810e6;p=monitor.git

diff --git a/monitor-server.spec b/monitor-server.spec
index 2071763..0576459 100644
--- a/monitor-server.spec
+++ b/monitor-server.spec
@@ -5,8 +5,8 @@
 %define url $URL: svn+ssh://svn.planet-lab.org/svn/Monitor/trunk/Monitor-server.spec $
 
 %define name monitor-server
-%define version 1.0
-%define taglevel 6
+%define version 1.1
+%define taglevel 0
 
 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 %global python_sitearch	%( python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)" )
@@ -32,6 +32,7 @@ Requires: openssh-clients
 Requires: perl-libwww-perl
 Requires: MySQL-python
 Requires: rt3 == 3.4.1
+Requires: nmap
 
 Requires: PLCWWW >= 4.2
 Requires: bootcd-planetlab-i386 >= 4.2
@@ -73,11 +74,15 @@ echo " * TODO: Setting up Monitor account in local MyPLC"
 mkdir -p $RPM_BUILD_ROOT/%{python_sitearch}/monitor
 install -d -D -m 755 monitor $RPM_BUILD_ROOT/%{python_sitearch}/monitor
 # TODO: need a much better way to do this.
-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 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
 install -D -m 755 threadpool.py $RPM_BUILD_ROOT/%{python_sitearch}/threadpool.py
 
+touch $RPM_BUILD_ROOT/var/www/cgi-bin/monitor/monitorconfig.php
+chmod 777 $RPM_BUILD_ROOT/var/www/cgi-bin/monitor/monitorconfig.php
+
 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
 
@@ -111,9 +116,18 @@ echo "Post processing"
 #chkconfig monitor-server on
 
 %changelog
+* Wed Sep 24 2008 Stephen Soltesz <soltesz@cs.princeton.edu> - Monitor-1.0-8
+- These are all changes in the latest Monitor code.  I will branch this version
+- next, before making additional large changes.
+
+* Mon Sep 01 2008 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - Monitor-1.0-7
+- Checkpointing current version for 4.2-rc21 - many many changes
+
 * 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
+
+%define module_current_branch 1.0