Merge branch 'master' of ssh://git.onelab.eu/git/sfa

diff --git a/setup.py b/setup.py
index 87a4529..46a8fe4 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -30,7 +30,7 @@ bins = [
     'sfa/client/sfiAddAttribute.py',
     'sfa/client/sfiDeleteAttribute.py',
     'sfatables/sfatables',
-    'keyconvert/keyconvert.py'
+    'keyconvert/keyconvert.py',
     'flashpolicy/sfa_flashpolicy.py',
     ]
 

diff --git a/sfa.spec b/sfa.spec
index 600230a..4f4c412 100644 (file)
--- a/sfa.spec
+++ b/sfa.spec
@@ -1,6 +1,6 @@
 %define name sfa
 %define version 1.0
-%define taglevel 15
+%define taglevel 16
 
 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 %global python_sitearch        %( python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)" )
@@ -197,6 +197,10 @@ fi
 
 
 %changelog
+* Tue Mar 08 2011 Andy Bavier <acb@cs.princeton.edu> - sfa-1.0-16
+- Fix build problem
+- First version of SFA scanner
+
 * Mon Mar 07 2011 Andy Bavier <acb@cs.princeton.edu> - sfa-1.0-15
 - Add support for Flash clients using flashpolicy
 - Fix problems with tag handling in RSpec
@@ -298,6 +302,10 @@ fi
   cache and use in more general ways.     
 
 %changelog
+* Tue Mar 08 2011 Andy Bavier <acb@cs.princeton.edu> - sfa-1.0-16
+- Fix build problem
+- First version of SFA scanner
+
 * Mon Mar 07 2011 Andy Bavier <acb@cs.princeton.edu> - sfa-1.0-15
 - Add support for Flash clients using flashpolicy
 - Fix problems with tag handling in RSpec