X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa.spec;h=b4b5d73edf1f9761b3ae02966a43367d08858087;hb=addec44d4a5f1c3b4b37a1b805839af0cdf1e8e2;hp=7fc7c77d9a8494d0cc7fc2617c339d7fb8b548a3;hpb=895ac5551806f949559e7a2e534cbb112a266f07;p=sfa.git

diff --git a/sfa.spec b/sfa.spec
index 7fc7c77d..b4b5d73e 100644
--- a/sfa.spec
+++ b/sfa.spec
@@ -1,4 +1,3 @@
-
 #
 # $Id$
 #
@@ -7,7 +6,7 @@
 
 %define name sfa
 %define version 0.9
-%define taglevel 6
+%define taglevel 8
 
 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 %global python_sitearch	%( python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)" )
@@ -34,6 +33,8 @@ Requires: pyOpenSSL >= 0.7
 Requires: m2crypto
 Requires: libxslt-python
 Requires: python-ZSI
+Requires: python-psycopg2
+Requires: myplc-config
 
 # python 2.5 has uuid module added, for python 2.4 we still need it
 %define has_uuid %(`python -c "import uuid" 2> /dev/null; echo $?`)
@@ -61,7 +62,7 @@ Requires: sfa
 This package provides the python libraries that the SFA implementation requires
 
 %description plc
-Geniwrapper implements the SFA interface which serves as a layer
+This package implements the SFA interface which serves as a layer
 between the existing PlanetLab interfaces and the SFA API.
 
 %description client
@@ -96,7 +97,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files plc
 %defattr(-,root,root)
-%config (noreplace) /etc/sfa/sfa_config
+%config /etc/sfa/default_config.xml
 %config (noreplace) /etc/sfa/aggregates.xml
 %config (noreplace) /etc/sfa/registries.xml
 /etc/init.d/sfa
@@ -112,7 +113,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/getNodes.py*
 %{_bindir}/getRecord.py*
 %{_bindir}/setRecord.py*
-%{_bindir}/genidump.py*
+%{_bindir}/sfadump.py*
 
 %files sfatables
 %{_bindir}/sfatables
@@ -124,6 +125,14 @@ rm -rf $RPM_BUILD_ROOT
 chkconfig --add sfa
 
 %changelog
+* Wed Jan 06 2010 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - sfa-0.9-8
+- checkpoint with fewer mentions of geni
+
+* Tue Jan 05 2010 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - sfa-0.9-7
+- checkpointing
+- this is believed to pass the tests; among other things:
+- reworked configuration based on the myplc config with xml skeleton (no more sfa_config)
+
 * Mon Nov 16 2009 anil vengalil <avengali@sophia.inria.fr> - sfa-0.9-6
 - This tag includes:
 - - Sfatables