Version: 0.5.1, Python 3 support

diff --git a/python-isodate.spec b/python-isodate.spec
index c0228ae6a8a15ce1f51439a0218fdf72708e193c..19ff5ea994e080aaf5fb69c0b27e0c50f35296fa 100644 (file)
--- a/python-isodate.spec
+++ b/python-isodate.spec
@@ -1,18 +1,32 @@
+
+# Conditional build:
+%bcond_without  python2 # CPython 2.x module
+%bcond_without  python3 # CPython 3.x module
+
 %define        module  isodate
 Summary:       An ISO 8601 date/time/duration parser and formater
 Summary(pl.UTF-8):     Moduł analizujący i formatujący daty/czas/okresy w formacie ISO 8601
 Name:          python-%{module}
-Version:       0.4.7
+Version:       0.5.1
 Release:       1
-License:       GPL v3
+License:       BSD
 Group:         Development/Languages
 Source0:       http://pypi.python.org/packages/source/i/isodate/isodate-%{version}.tar.gz
-# Source0-md5: 4ab330655445387b449de381f6ca864c
+# Source0-md5: 22232a6b0f5d320610ae45722c1b9542
 URL:           http://pypi.python.org/pypi/isodate/
+%if %{with python2}
+BuildRequires: python-devel
+BuildRequires: python-distribute
+BuildRequires: python-modules
+%endif
+%if %{with python3}
+BuildRequires: python-devel
+BuildRequires: python-distribute
 BuildRequires: python-modules
-BuildRequires: python-setuptools
+%endif
 BuildRequires: rpm-pythonprov
 BuildRequires: rpmbuild(macros) >= 1.219
+Requires:      python-modules
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -29,26 +43,77 @@ formacie ISO 8601. Implementacja jest zgodna ze standardem
 ISO8601:2004 i zawiera tylko reprezentacje daty/czasu opisane w
 standardzie.
 
+%package -n python3-%{module}
+Summary:       An ISO 8601 date/time/duration parser and formater
+Summary(pl.UTF-8):     Moduł analizujący i formatujący daty/czas/okresy w formacie ISO 8601
+Group:         Libraries/Python
+Requires:      python3-modules
+
+%description -n python3-%{module}
+This module implements ISO 8601 date, time and duration parsing. The
+implementation follows ISO8601:2004 standard, and implements only
+date/time representations mentioned in the standard. If something is
+not mentioned there, then it is treated as non existent, and not as an
+allowed option.
+
+%description -n python3-%{module} -l pl.UTF-8
+Ten moduł zawiera implementację analizy daty, czasu i okresów w
+formacie ISO 8601. Implementacja jest zgodna ze standardem
+ISO8601:2004 i zawiera tylko reprezentacje daty/czasu opisane w
+standardzie.
+
 %prep
 %setup -q -n isodate-%{version}
 
 %build
-%{__python} setup.py build
+%if %{with python2}
+%{__python} setup.py build --build-base build-2 %{?with_tests:test}
+%endif
+
+%if %{with python3}
+%{__python3} setup.py build --build-base build-3 %{?with_tests:test}
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install \
-       --optimize=2 \
-       --root=$RPM_BUILD_ROOT
+
+%if %{with python2}
+%{__python} setup.py \
+        build --build-base build-2 \
+        install --skip-build \
+        --optimize=2 \
+        --root=$RPM_BUILD_ROOT
 
 %py_postclean
+%endif
+
+%if %{with python3}
+%{__python3} setup.py \
+        build --build-base build-3 \
+        install --skip-build \
+        --optimize=2 \
+        --root=$RPM_BUILD_ROOT
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc CHANGES.txt README.txt TODO.txt
+%doc CHANGES.txt README.rst TODO.txt
 %dir %{py_sitescriptdir}/isodate
 %{py_sitescriptdir}/isodate/*.py[co]
+%dir %{py_sitescriptdir}/isodate/tests
+%{py_sitescriptdir}/isodate/tests/*.py[co]
 %{py_sitescriptdir}/isodate-%{version}-py*.egg-info
+
+%files -n python3-%{module}
+%defattr(644,root,root,755)
+%doc CHANGES.txt README.rst TODO.txt
+%dir %{py3_sitescriptdir}/isodate
+%{py3_sitescriptdir}/isodate/*.py
+%{py3_sitescriptdir}/isodate/__pycache__
+%dir %{py3_sitescriptdir}/isodate/tests
+%{py3_sitescriptdir}/isodate/tests/*.py
+%{py3_sitescriptdir}/isodate/tests/__pycache__
+%{py3_sitescriptdir}/isodate-%{version}-py*.egg-info