Merge remote-tracking branch 'origin/master'

diff --git a/setup.py b/setup.py
index 2affbc7..a14972c 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -35,6 +35,7 @@ packages = [
     'sfa/rspecs/elements/versions',
     'sfa/rspecs/versions',
     'sfa/client',
+    'sfa/clientbin',
     'sfa/planetlab',
     'sfa/openstack',
     'sfa/federica',

diff --git a/sfa.spec b/sfa.spec
index ea11aa2..8d527e9 100644 (file)
--- a/sfa.spec
+++ b/sfa.spec
@@ -151,7 +151,7 @@ make VERSIONTAG="%{version}-%{taglevel}" SCMURL="%{SCMURL}" install DESTDIR="$RP
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%{python_sitelib}/sfa/__init__.py
+%{python_sitelib}/sfa/__init__.py*
 %{python_sitelib}/sfa/trust
 %{python_sitelib}/sfa/storage
 %{python_sitelib}/sfa/util