git://git.onelab.eu
/
monitor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tagging module Monitor - Monitor-3.0-1
[monitor.git]
/
Monitor.spec
diff --git
a/Monitor.spec
b/Monitor.spec
index
005e66a
..
3b4e78c
100644
(file)
--- a/
Monitor.spec
+++ b/
Monitor.spec
@@
-6,7
+6,7
@@
%define name monitor
%define version 3.0
%define name monitor
%define version 3.0
-%define taglevel
0
+%define taglevel
1
%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
%global python_sitearch %( python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)" )
%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
%global python_sitearch %( python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)" )
@@
-53,8
+53,8
@@
Summary: Monitor hooks for the PLC server.
Group: Applications/System
Requires: python
Group: Applications/System
Requires: python
-Requires: python-sqlalchemy
-Requires: python-elixir
+
#
Requires: python-sqlalchemy
+
#
Requires: python-elixir
Requires: openssh-clients
Requires: perl-libwww-perl
Requires: openssh-clients
Requires: perl-libwww-perl
@@
-65,9
+65,9
@@
Requires: nmap
Requires: PLCWWW >= 4.2
Requires: bootcd-planetlab-i386 >= 4.2
Requires: PLCWWW >= 4.2
Requires: bootcd-planetlab-i386 >= 4.2
-Requires: zabbix-client
-Requires: zabbix-gui
-Requires: zabbix-server
+
#
Requires: zabbix-client
+
#
Requires: zabbix-gui
+
#
Requires: zabbix-server
%description server
The server side include all python modules and scripts needed to fully
%description server
The server side include all python modules and scripts needed to fully
@@
-202,7
+202,7
@@
rm -rf $RPM_BUILD_ROOT
php /usr/share/%{name}/zabbix/getdefines.php > %{python_sitearch}/monitor/database/zabbixapi/defines.py
# apply patches to zabbix
php /usr/share/%{name}/zabbix/getdefines.php > %{python_sitearch}/monitor/database/zabbixapi/defines.py
# apply patches to zabbix
-patch -d /var/www/html/zabbix/ -p0 < /usr/share/%{name}/zabbix/zabbix-auto-login.diff
+
#
patch -d /var/www/html/zabbix/ -p0 < /usr/share/%{name}/zabbix/zabbix-auto-login.diff
#chkconfig --add monitor-server
#chkconfig monitor-server on
#chkconfig --add monitor-server
#chkconfig monitor-server on
@@
-216,6
+216,10
@@
chkconfig --add monitor-runlevelagent
chkconfig monitor-runlevelagent on
%changelog
chkconfig monitor-runlevelagent on
%changelog
+* Thu Apr 16 2009 Stephen Soltesz <soltesz@cs.princeton.edu> - Monitor-3.0-1
+- major merge from 2.0 branch.
+- ready to be updated with 4.3 and web changes.
+
* Fri Feb 27 2009 Stephen Soltesz <soltesz@cs.princeton.edu> - Monitor-2.0-1
- preparing to make a 2.0 branch for monitor.
* Fri Feb 27 2009 Stephen Soltesz <soltesz@cs.princeton.edu> - Monitor-2.0-1
- preparing to make a 2.0 branch for monitor.