%define name monitor
# keep this version in sync with monitor/monitor_version.py
%define version 3.0
-%define taglevel 27
+%define taglevel 28
%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
%global python_sitearch %( python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)" )
Distribution: PlanetLab %{plrelease}
URL: %(echo %{url} | cut -d ' ' -f 2)
-BuildRequires: python-setuptools-devel
+# this is only required for fedora and we have this in devel.pkgs for
+# all fedora builds.
+# BuildRequires: python-setuptools-devel
Summary: Monitor account initialization for the root image.
Requires: python
Requires: monitor-server-deps
-Requires: monitor-pcucontrol
Requires: PLCWWW >= 4.2
Requires: bootcd-%{pldistro}-%{_arch} >= 4.2
+Requires: pcucontrol
%description server
The server side include all python modules and scripts needed to fully
operation, track, and interact with any third-party monitoring software, such
as Zabbix DB.
-######################################## PCU Control
-
-%package pcucontrol
-summary: pcu controls for monitor and plcapi
-group: applications/system
-requires: python
-requires: OpenIPMI-tools
-
-%description pcucontrol
-both monitor and the plcapi use a set of common commands to reboot machines
-using their external or internal pcus. this package is a library of several
-supported models.
-
####################################### RunlevelAgent
%package runlevelagent
summary: the RunlevelAgent that reports node runlevels
%prep
%setup -q
-%build
-# NOTE: the build uses g++ cmdamt/
-# NOTE: TMPDIR is needed here b/c the tmpfs of the build vserver is too small.
-cd pcucontrol/models/intelamt
-export TMPDIR=$PWD/tmp
-make
-cd ..
-
%install
rm -rf $RPM_BUILD_ROOT
#################### CLIENT
# apache configuration
install -D -m 644 web/monitorweb-httpd.conf $RPM_BUILD_ROOT/etc/httpd/conf.d/
-# we'll install monitor and pcucontrol in site-packages
-# install rest to /usr/share/monitor
+# we'll install monitor in site-packages install rest to
+# /usr/share/monitor
rsync -a --exclude archive-pdb --exclude .svn --exclude CVS \
--exclude monitor/ \
- --exclude pcucontol/ \
./ $RPM_BUILD_ROOT/usr/share/%{name}/
# install monitor python package
rsync -a --exclude .svn ./monitor/ $RPM_BUILD_ROOT/%{python_sitearch}/monitor/
-# and pcucontrol
-rsync -a --exclude .svn ./pcucontrol/ $RPM_BUILD_ROOT/%{python_sitearch}/pcucontrol/
-
# install third-party module to site-packages
install -D -m 755 threadpool.py $RPM_BUILD_ROOT/%{python_sitearch}/threadpool.py
/var/lib/%{name}
#/var/www/cgi-bin/monitor
%{_sysconfdir}/cron.d/monitor-server.cron
-%{python_sitearch}/threadpool.py*
-%{python_sitearch}/monitor
-%{python_sitearch}/*.egg/
-%{python_sitearch}/easy-install.pth
-%{python_sitearch}/tg-admin
%{_sysconfdir}/plc.d/monitor
%{_sysconfdir}/plc.d/monitor.functions
%{_sysconfdir}/plc.d/zabbix
%{_sysconfdir}/httpd/conf.d
+%{python_sitearch}
%files client
%defattr(-,root,root)
#%{_sysconfdir}/cron.d/monitor
/usr/bin/timeout.pl
-%files pcucontrol
-%{python_sitearch}/pcucontrol
-
%files runlevelagent
-/usr/bin/RunlevelAgent.py
-/usr/bin/RunlevelAgent.pyo
-/usr/bin/RunlevelAgent.pyc
+/usr/bin/RunlevelAgent.py*
/%{_initrddir}/monitor-runlevelagent
%post server-deps
%changelog
+* Thu Dec 17 2009 Baris Metin <Talip-Baris.Metin@sophia.inria.fr> - Monitor-3.0-28
+- do not need buildrequires. a new tag to fix centos builds
+
* Thu Dec 17 2009 Baris Metin <Talip-Baris.Metin@sophia.inria.fr> - Monitor-3.0-27
- fix rpm build issues