[python-asciitable/f14: 2/2] Merge branch 'master' into f14

[Sergio Pascual]

commit 8abb8928893a5b6a4e38f2614debc45e5fbf8ce2
Merge: 30f6a5c ac8b32d
Author: Sergio Pascual <sergiopr at fis.ucm.es>
Date:   Fri Sep 30 15:05:20 2011 +0200

    Merge branch 'master' into f14
    
    Conflicts:
    	python-asciitable.spec

 .gitignore             |    1 +
 python-asciitable.spec |    7 +++++--
 sources                |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --cc python-asciitable.spec
index 2c23a97,5629935..d738824
--- a/python-asciitable.spec
+++ b/python-asciitable.spec
@@@ -1,8 -1,14 +1,8 @@@
  %global upname asciitable
  
 -%if 0%{?fedora} > 12 || 0%{?rhel} > 6
 -%global with_python3 1
 -%else
 -%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print (get_python_lib())")}
 -%endif
 -
  Name: python-%{upname}
- Version: 0.7.0.2
- Release: 1%{?dist}.1
+ Version: 0.7.1
+ Release: 1%{?dist}
  Summary: Extensible ASCII table reader and writer
  License: BSD
  
@@@ -48,12 -97,22 +48,15 @@@ rm -rf %{buildroot
  %doc CHANGES doc/index.rst
  %{python_sitelib}/*
  
 -%if 0%{?with_python3}
 -%files -n python3-asciitable
 -%doc CHANGES doc/index.rst
 -%{python3_sitelib}/*
 -%endif # with_python3
 -
  %changelog
+ * Fri Sep 30 2011 Sergio Pascual <sergiopr at fedoraproject.org> - 0.7.1-1
+ - New upstream version, with bugfixes
+ 
 -* Sat Jul 2 2011 Sergio Pascual <sergiopr at fedoraproject.org> - 0.7.0.2-1
 -- Problem with doctest fixed upstream
 +* Fri Jul 15 2011 Sergio Pascual <sergiopr at fedoraproject.org> - 0.7.0.2-1.1
 +- Removed python3 support (no python3-numpy in f14)
  
 -* Sat Jul 2 2011 Sergio Pascual <sergiopr at fedoraproject.org> - 0.7.0.1-1
 +* Tue Jul 5 2011 Sergio Pascual <sergiopr at fedoraproject.org> - 0.7.0.2-1
  - New upstream version with Latex, AASTex support
 -- Patch added to fix errors in the doctests of Cds
  
  * Mon Jun 6 2011 Sergio Pascual <sergiopr at fedoraproject.org> - 0.6.0-2
  - Adding index.rst before importing