[python-logilab-common/f16: 7/7] Merge branch 'f17' into f16

[Brian C. Lane]

commit 83c1bd8d5f8f3ce13c89f653d7011d0b79fe94e4
Merge: ef0b560 b0e8596
Author: Brian C. Lane <bcl at redhat.com>
Date:   Fri Jan 11 09:57:19 2013 -0800

    Merge branch 'f17' into f16

 .gitignore                 |    6 ++--
 python-logilab-common.spec |   79 ++++++++++++++++++++++++++++++++++++-------
 sources                    |    2 +-
 3 files changed, 70 insertions(+), 17 deletions(-)
---
diff --cc .gitignore
index f320b71,90db39b..0baedee
--- a/.gitignore
+++ b/.gitignore
@@@ -1,4 -1,7 +1,4 @@@
--logilab-common-0.50.3.tar.gz
--/logilab-common-0.53.0.tar.gz
--/logilab-common-0.55.1.tar.gz
+ /logilab-common-0.56.0.tar.gz
  /logilab-common-0.57.1.tar.gz
+ /logilab-common-0.58.2.tar.gz
+ /logilab-common-0.58.3.tar.gz
diff --cc python-logilab-common.spec
index e50a025,c897ae2..e478a08
--- a/python-logilab-common.spec
+++ b/python-logilab-common.spec
@@@ -44,11 -85,32 +85,23 @@@ rm -rf %{buildroot
  %files
  %defattr(-,root,root,-)
  %doc README ChangeLog COPYING
- %{_python_sitelib}/logilab*
- %{_bindir}/*
+ %{python_sitelib}/logilab*
+ %{_bindir}/pytest
  
+ %if 0%{?with_python3}
+ %files -n python3-logilab-common
+ %defattr(-,root,root,-)
+ %doc README ChangeLog COPYING
+ %{python3_sitelib}/logilab*
+ %{_bindir}/python3-pytest
+ %endif # with_python3
  
  %changelog
+ * Thu Jan 10 2013 Brian C. Lane <bcl at redhat.com> 0.58.3-1
+ - Upstream 0.58.3
+ - Add python3-logilab-common subpackage to spec. Not ready to turn it on yet
+   due to this upstream bug: http://www.logilab.org/ticket/110213
+ 
 -* Fri Aug 03 2012 Brian C. Lane <bcl at redhat.com> 0.58.2-1
 -- Upstream 0.58.2
 -
 -* Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.57.1-3
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 -
 -* Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.57.1-2
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 -
  * Fri Nov 18 2011 Brian C. Lane <bcl at redhat.com> - 0.57.1-1
  - Upstream 0.57.1