[python-cliff/el6: 3/3] Merge branch 'master' into el6

[Ralph Bean]

commit ddedcb344c7f6c550f27b142529989aea229c7aa
Merge: 701ed14 d3eae25
Author: Ralph Bean <rbean at redhat.com>
Date:   Tue Jan 22 09:44:55 2013 -0500

    Merge branch 'master' into el6
    
    Conflicts:
    	python-cliff.spec

 .gitignore        |    1 +
 python-cliff.spec |   28 ++++++++++++++--------------
 sources           |    2 +-
 3 files changed, 16 insertions(+), 15 deletions(-)
---
diff --cc python-cliff.spec
index 4799c10,a552e96..16cad09
--- a/python-cliff.spec
+++ b/python-cliff.spec
@@@ -28,14 -23,7 +23,12 @@@ BuildRequires:    python-cmd
  Requires:         python-setuptools
  Requires:         python-prettytable
  Requires:         python-cmd2
- Requires:         python-tablib
  
 +%if %{?rhel}%{!?rhel:0} >= 6
 +BuildRequires:    python-argparse
 +Requires:         python-argparse
 +%endif
 +
  
  %if 0%{?with_python3}
  BuildRequires:    python3-devel
@@@ -125,9 -112,14 +117,17 @@@ pop
  
  
  %changelog
+ * Tue Jan 22 2013 Ralph Bean <rbean at redhat.com> - 1.3-1
+ - Latest upstream.
+ - Enabled python3 subpackage.
+ - Remove requirement on python-tablib
+ 
+ * Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-3
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+ 
 +* Fri Jul 06 2012 Ralph Bean <rbean at redhat.com> - 1.0-3
 +- Require python-argparse on epel.
 +
  * Thu Jul 05 2012 Ralph Bean <rbean at redhat.com> - 1.0-2
  - Manually disable python3 support until python3-prettytable is available.