[python-logilab-common] - Upstream 0.58.3 - Add python3-logilab-common subpackage to spec. Not ready to turn it on yet due

[Brian C. Lane]

commit b0e85963aedf21ce013f35e0e1c4ac9772d7257a
Author: Brian C. Lane <bcl at redhat.com>
Date:   Fri Jan 11 09:46:00 2013 -0800

    - 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

 .gitignore                 |    1 +
 python-logilab-common.spec |   79 ++++++++++++++++++++++++++++++++++++-------
 sources                    |    2 +-
 3 files changed, 68 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index dfe8b43..90db39b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ logilab-common-0.50.3.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 --git a/python-logilab-common.spec b/python-logilab-common.spec
index 3f4ebc0..c897ae2 100644
--- a/python-logilab-common.spec
+++ b/python-logilab-common.spec
@@ -1,10 +1,13 @@
-%{!?_python_sitelib: %define _python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%if 0%{?fedora} > 12
+%global with_python3 0
+%else
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print (get_python_lib())")}
+%endif
 
 Name:           python-logilab-common
-Version:        0.58.2
+Version:        0.58.3
 Release:        1%{?dist}
 Summary:        Common libraries for Logilab projects
-
 Group:          Development/Libraries
 License:        GPLv2+
 URL:            http://www.logilab.org/projects/common
@@ -12,43 +15,93 @@ Source0:        ftp://ftp.logilab.org/pub/common/logilab-common-%{version}.tar.g
 BuildArch:      noarch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
-BuildRequires:  python-devel python-setuptools python-unittest2
-Requires:       mx
-
+BuildRequires:  python-devel python-setuptools
+%if 0%{?with_python3}
+BuildRequires:  python3-devel python3-setuptools
+%endif # if with_python3
 
 %description
-This package contains several modules providing low level functionality 
+This package contains several modules providing low level functionality
 shared among some python projects developed by logilab.
 
+%if 0%{?with_python3}
+%package -n python3-logilab-common
+Summary:        Common libraries for Logilab projects
+Group:          Development/Libraries
+
+%description -n python3-logilab-common
+This package contains several modules providing low level functionality
+shared among some python projects developed by logilab.
+%endif # if with_python3
 
 %prep
 %setup -q -n logilab-common-%{version}
 
+%if 0%{?with_python3}
+rm -rf %{py3dir}
+cp -a . %{py3dir}
+%endif # with_python3
 
 %build
 %{__python} setup.py build
 
+%if 0%{?with_python3}
+pushd %{py3dir}
+%{__python3} setup.py build
+popd
+%endif # with_python3
 
 %install
-rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
-rm -rf $RPM_BUILD_ROOT%{_python_sitelib}/logilab/common/test
+rm -rf %{buildroot}
+
+%if 0%{?with_python3}
+pushd %{py3dir}
+%{__python3} setup.py install -O1 --skip-build --root %{buildroot}
+rm -rf %{buildroot}%{python3_sitelib}/logilab/common/test
+# Add python3- to the binaries
+for FILE in %{buildroot}%{_bindir}/*; do
+    NAME=$(basename $FILE)
+    mv $FILE %{buildroot}%{_bindir}/python3-$NAME
+done
+popd
+%endif # with_python3
+
+%{__python} setup.py install -O1 --skip-build --root %{buildroot}
+rm -rf %{buildroot}%{python_sitelib}/logilab/common/test
 
 %check
 %{__python} setup.py test
 
+%if 0%{?with_python3}
+pushd %{py3dir}
+%{__python3} setup.py test
+popd
+%endif # with_python3
+
 %clean
-rm -rf $RPM_BUILD_ROOT
+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
 
diff --git a/sources b/sources
index ae810f0..a2064e4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a745888475d988300a76b0c87a5f4381  logilab-common-0.58.2.tar.gz
+d6ea36a311381de92b7d7de3ec69e018  logilab-common-0.58.3.tar.gz