From bb21b17d3cc4c498a029fb68e016f447870e642d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bar=C4=B1=C5=9F=20Metin?= Date: Tue, 22 Dec 2009 15:54:28 +0000 Subject: [PATCH] move easy_install calls back to post install. running easy_install didn't work as I thought it would, every now and again it fails and break our build. --- Monitor.spec | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Monitor.spec b/Monitor.spec index 4018efd..d3bac18 100644 --- a/Monitor.spec +++ b/Monitor.spec @@ -25,10 +25,6 @@ Packager: PlanetLab Central Distribution: PlanetLab %{plrelease} URL: %(echo %{url} | cut -d ' ' -f 2) -# 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. Group: Applications/System @@ -58,6 +54,7 @@ Summary: Monitor hooks for the PLC server. Group: Applications/System Requires: python +Requires: python-setuptools-devel Requires: python-peak-util-extremes Requires: compat-libstdc++-296 @@ -127,14 +124,6 @@ install -d $RPM_BUILD_ROOT/var/www/html/monitorlog/ install -d $RPM_BUILD_ROOT/etc/httpd/conf.d/ install -d $RPM_BUILD_ROOT/%{python_sitearch}/monitor -# pack monitor's dependencies in RPM to make it easier to deploy. -export TMPDIR=/var/tmp/ -export PYTHONPATH=$PYTHONPATH:$RPM_BUILD_ROOT/%{python_sitearch}/ -easy_install -d $RPM_BUILD_ROOT/%{python_sitearch}/ -UZ http://files.turbogears.org/eggs/TurboGears-1.0.7-py2.5.egg -easy_install -d $RPM_BUILD_ROOT/%{python_sitearch}/ -UZ http://pypi.python.org/packages/source/S/SQLAlchemy/SQLAlchemy-0.5.3.tar.gz -easy_install -d $RPM_BUILD_ROOT/%{python_sitearch}/ -UZ Elixir -rm -rf $RPM_BUILD_ROOT/%{python_sitearch}/site.py* - # plc.d scripts install -D -m 644 monitor.functions $RPM_BUILD_ROOT/%{_sysconfdir}/plc.d/monitor.functions install -D -m 755 monitor-server.init $RPM_BUILD_ROOT/%{_sysconfdir}/plc.d/monitor @@ -206,6 +195,17 @@ rm -rf $RPM_BUILD_ROOT /%{_initrddir}/monitor-runlevelagent %post server-deps +# +# TODO: depend on distribution packages where feasible. +# +# it would be better to be able to depend on the distribution's +# packages for these additional python modules, but packages provided +# by fedora 8 (our current deployment) doesn't match the version +# requirements. +export TMPDIR=/var/tmp/ +easy_install -UZ http://files.turbogears.org/eggs/TurboGears-1.0.7-py2.5.egg +easy_install -UZ http://pypi.python.org/packages/source/S/SQLAlchemy/SQLAlchemy-0.5.3.tar.gz +easy_install -UZ Elixir # crazy openssl libs for racadm binary ln -s /lib/libssl.so.0.9.8b /usr/lib/libssl.so.2 -- 2.43.0