first attempt to split sfa package into

sfa (server) and sfa-common (libraries)

diff --git a/debian/control b/debian/control
index ebaa0d1..897dc75 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,19 +3,17 @@ Maintainer: Thierry Parmentelat <Thierry.Parmentelat@inria.fr>
 Section: misc
 Priority: optional
 Standards-Version: 3.9.2
 Section: misc
 Priority: optional
 Standards-Version: 3.9.2

-Build-Depends: devscripts, debhelper (>=7.0.50~), debconf, dpatch
+Build-Depends: devscripts, debhelper (>=7.0.50~), debconf, dpatch, python-setuptools, make
+
+Package: sfa
+Architecture: any
+Depends: postgresql (>= 8.2), python-psycopg2, python-sqlalchemy, python-migrate, uuid-runtime
+Description: Server-side for SFA, generic implementation derived from PlanetLab

 
 Package: sfa-common
 Architecture: any
 
 Package: sfa-common
 Architecture: any

-Depends: python (>= 2.5), python-openssl (>= 0.7), python-m2crypto, python-dateutil, python-lxml, python-libxslt1, python-setuptools, python-zsi, postgresql (>= 8.2), python-psycopg2, python-sqlalchemy, python-migrate, uuid-runtime
-#further depends from fedora - no obvious match on debian for now
-#Requires: xmlsec1-openssl-devel  (libxmlsec1-dev or libxmlsec1-openssl or ??)
-#Requires: util-linux-ng
-#Requires: postgresql-python
-#Requires: python-psycopg2
-# the eucalyptus aggregate uses this module
-#Requires: python-xmlbuilder
-Description: Slice Facility Architecture, generic implementation derived from PlanetLab
+Depends: python (>= 2.7), python-openssl (>= 0.7), python-m2crypto, python-dateutil, python-lxml, python-libxslt1, python-zsi
+Description: Python libraries for SFA, generic implementation derived from PlanetLab

 
 Package: sfa-flashpolicy
 Architecture: any
 
 Package: sfa-flashpolicy
 Architecture: any

diff --git a/debian/sfa-common.install b/debian/sfa-common.install
index 35e89f5..fae3b28 100644 (file)
--- a/debian/sfa-common.install
+++ b/debian/sfa-common.install
@@ -9,17 +9,3 @@ usr/lib*/python*/site-packages/sfa/managers
 usr/lib*/python*/site-packages/sfa/importer
 usr/lib*/python*/site-packages/sfa/rspecs
 usr/lib*/python*/site-packages/sfa/client
 usr/lib*/python*/site-packages/sfa/importer
 usr/lib*/python*/site-packages/sfa/rspecs
 usr/lib*/python*/site-packages/sfa/client

-usr/bin/sfa-start.py*
-usr/bin/sfaadmin.py*
-usr/bin/sfaadmin
-usr/bin/keyconvert.py*
-usr/bin/sfa-config-tty
-usr/bin/sfa-config
-etc/sfa/default_config.xml
-etc/sfa/aggregates.xml
-etc/sfa/registries.xml
-etc/init.d/sfa
-etc/init.d/functions.sfa
-usr/share/sfa/migrations
-usr/share/sfa/examples
-var/www/html/wsdl/*.wsdl

diff --git a/sfa.spec b/sfa.spec
index 0d3c427..7c4d660 100644 (file)
--- a/sfa.spec
+++ b/sfa.spec
@@ -21,23 +21,11 @@ Packager: PlanetLab Central <support@planet-lab.org>
 Distribution: PlanetLab %{plrelease}
 URL: %{SCMURL}
 
 Distribution: PlanetLab %{plrelease}
 URL: %{SCMURL}
 

-Summary: the SFA python libraries
+Summary: Server-side for SFA, generic implementation derived from PlanetLab 

 Group: Applications/System
 BuildRequires: make
 Group: Applications/System
 BuildRequires: make

+BuildRequires: python-setuptools

 
 

-Requires: python >= 2.5
-Requires: pyOpenSSL >= 0.7
-Requires: m2crypto
-Requires: xmlsec1-openssl-devel
-Requires: libxslt-python
-Requires: python-ZSI
-# for uuidgen - used in db password generation
-# on f8 this actually comes with e2fsprogs, go figure
-Requires: util-linux-ng
-# xmlbuilder depends on lxml
-Requires: python-lxml
-Requires: python-setuptools
-Requires: python-dateutil

 # for the registry
 Requires: postgresql >= 8.2, postgresql-server >= 8.2
 Requires: postgresql-python
 # for the registry
 Requires: postgresql >= 8.2, postgresql-server >= 8.2
 Requires: postgresql-python


@@ -47,29 +35,28 @@ Requires: python-sqlalchemy
 Requires: python-migrate
 # the eucalyptus aggregate uses this module
 Requires: python-xmlbuilder
 Requires: python-migrate
 # the eucalyptus aggregate uses this module
 Requires: python-xmlbuilder

+# for uuidgen - used in db password generation
+# on f8 this actually comes with e2fsprogs, go figure
+Requires: util-linux-ng
+# and the SFA libraries of course
+Requires: sfa-common

  
  

-# python 2.5 has uuid module added, for python 2.4 we still need it.
-# we can't really check for if we can load uuid as a python module,
-# it'll be installed by "devel.pkgs". we have the epel repository so
-# python-uuid will be provided. but we can test for the python
-# version.
-# %define has_py24 %( python -c "import sys;sys.exit(sys.version_info[0:2] == (2,4))" 2> /dev/null; echo $? )
-# %if %has_py24
-#
-# this also didn't work very well. I'll just check for distroname - baris
-#%if %{distroname} == "centos5"
-#Requires: python-uuid
-#%endif
-
-%package flashpolicy
-Summary: SFA support for flash clients
+%package common
+Summary: Python libraries for SFA, generic implementation derived from PlanetLab

 Group: Applications/System
 Group: Applications/System

-Requires: sfa
+Requires: python >= 2.7
+Requires: pyOpenSSL >= 0.7
+Requires: m2crypto
+Requires: python-dateutil
+Requires: python-lxml
+Requires: libxslt-python
+Requires: python-ZSI
+Requires: xmlsec1-openssl-devel

 
 %package client
 Summary: sfi, the SFA experimenter-side CLI
 Group: Applications/System
 
 %package client
 Summary: sfi, the SFA experimenter-side CLI
 Group: Applications/System

-Requires: sfa
+Requires: sfa-common

 Requires: pyOpenSSL >= 0.7
 
 %package plc
 Requires: pyOpenSSL >= 0.7
 
 %package plc


@@ -77,11 +64,10 @@ Summary: the SFA layer around MyPLC
 Group: Applications/System
 Requires: sfa
 
 Group: Applications/System
 Requires: sfa
 

-#%package cm
-#Summary: the SFA layer around MyPLC NodeManager
-#Group: Applications/System
-#Requires: sfa
-#Requires: pyOpenSSL >= 0.6
+%package flashpolicy
+Summary: SFA support for flash clients
+Group: Applications/System
+Requires: sfa

 
 %package federica
 Summary: the SFA layer around Federica
 
 %package federica
 Summary: the SFA layer around Federica


@@ -111,14 +97,11 @@ Provides: python-xmlbuilder
 %package tests
 Summary: unit tests suite for SFA
 Group: Applications/System
 %package tests
 Summary: unit tests suite for SFA
 Group: Applications/System

-Requires: sfa
+Requires: sfa-common

 
 %description
 This package provides the python libraries for the PlanetLab implementation of SFA
 
 
 %description
 This package provides the python libraries for the PlanetLab implementation of SFA
 

-%description flashpolicy
-This package provides support for adobe flash client applications.  
-

 %description client
 This package provides the client side of the SFA API, in particular
 sfi.py, together with other utilities.
 %description client
 This package provides the client side of the SFA API, in particular
 sfi.py, together with other utilities.


@@ -127,9 +110,8 @@ sfi.py, together with other utilities.
 This package implements the SFA interface which serves as a layer
 between the existing PlanetLab interfaces and the SFA API.
 
 This package implements the SFA interface which serves as a layer
 between the existing PlanetLab interfaces and the SFA API.
 

-#%description cm
-#This package implements the SFA interface which serves as a layer
-#between the existing PlanetLab NodeManager interfaces and the SFA API.
+%description flashpolicy
+This package provides support for adobe flash client applications.  

 
 %description federica
 The SFA driver for FEDERICA.
 
 %description federica
 The SFA driver for FEDERICA.


@@ -166,17 +148,6 @@ make VERSIONTAG="%{version}-%{taglevel}" SCMURL="%{SCMURL}" install DESTDIR="$RP
 rm -rf $RPM_BUILD_ROOT
 
 %files
 rm -rf $RPM_BUILD_ROOT
 
 %files

-%{python_sitelib}/sfa/__init__.py*
-%{python_sitelib}/sfa/trust
-%{python_sitelib}/sfa/storage
-%{python_sitelib}/sfa/util
-%{python_sitelib}/sfa/server
-%{python_sitelib}/sfa/methods
-%{python_sitelib}/sfa/generic
-%{python_sitelib}/sfa/managers
-%{python_sitelib}/sfa/importer
-%{python_sitelib}/sfa/rspecs
-%{python_sitelib}/sfa/client

 /etc/init.d/sfa
 %{_bindir}/sfa-start.py*
 %{_bindir}/sfaadmin.py*
 /etc/init.d/sfa
 %{_bindir}/sfa-start.py*
 %{_bindir}/sfaadmin.py*


@@ -191,9 +162,18 @@ rm -rf $RPM_BUILD_ROOT
 /usr/share/sfa/examples
 /var/www/html/wsdl/*.wsdl
 
 /usr/share/sfa/examples
 /var/www/html/wsdl/*.wsdl
 

-%files flashpolicy
-%{_bindir}/sfa_flashpolicy.py*
-/etc/sfa/sfa_flashpolicy_config.xml
+%files common
+%{python_sitelib}/sfa/__init__.py*
+%{python_sitelib}/sfa/trust
+%{python_sitelib}/sfa/storage
+%{python_sitelib}/sfa/util
+%{python_sitelib}/sfa/server
+%{python_sitelib}/sfa/methods
+%{python_sitelib}/sfa/generic
+%{python_sitelib}/sfa/managers
+%{python_sitelib}/sfa/importer
+%{python_sitelib}/sfa/rspecs
+%{python_sitelib}/sfa/client

 
 %files client
 %config (noreplace) /etc/sfa/sfi_config
 
 %files client
 %config (noreplace) /etc/sfa/sfi_config


@@ -216,12 +196,10 @@ rm -rf $RPM_BUILD_ROOT
 /etc/sfa/xml.xsd
 /etc/sfa/protogeni-rspec-common.xsd
 /etc/sfa/topology
 /etc/sfa/xml.xsd
 /etc/sfa/protogeni-rspec-common.xsd
 /etc/sfa/topology

-#%{_bindir}/gen-sfa-cm-config.py*

 
 

-#%files cm
-#/etc/init.d/sfa-cm
-#%{_bindir}/sfa_component_setup.py*
-## cron jobs here 
+%files flashpolicy
+%{_bindir}/sfa_flashpolicy.py*
+/etc/sfa/sfa_flashpolicy_config.xml

 
 %files federica
 %{python_sitelib}/sfa/federica
 
 %files federica
 %{python_sitelib}/sfa/federica