limb pushed to python-icalendar (f20). "Update to latest upstream (..more)"

[notifications at fedoraproject.org]

>From 7b1665739fbea29c7271fdc0a1c46fecd61d1cea Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date: Tue, 7 Jan 2014 16:10:37 +0100
Subject: Update to latest upstream

- Add python3 subpackage

diff --git a/.gitignore b/.gitignore
index 131d49e..6e4aa8e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
 icalendar-2.1.tar.gz
 /icalendar-3.0.1b2.tar.gz
 /icalendar-3.4.tar.gz
+/icalendar-3.6.tar.gz
+/icalendar-3.6.1.tar.gz
diff --git a/python-icalendar.spec b/python-icalendar.spec
index 6b3e4aa..e3d37b4 100644
--- a/python-icalendar.spec
+++ b/python-icalendar.spec
@@ -1,18 +1,29 @@
+%global with_python3 1
+
 Name:           python-icalendar
-Version:        3.4
-Release:        3%{?dist}
+Version:        3.6.1
+Release:        1%{?dist}
 Summary:        Parser/generator of iCalendar files following the RFC 2445
 
-Group:          Development/Libraries
 License:        BSD
 URL:            http://pypi.python.org/pypi/icalendar
 Source0:        http://pypi.python.org/packages/source/i/icalendar/icalendar-%{version}.tar.gz
 
 BuildArch:      noarch
+
 BuildRequires:  python2-devel
 BuildRequires:  python-setuptools
 BuildRequires:  pytz
 BuildRequires:  python-dateutil
+BuildRequires:  python-tox
+BuildRequires:  python-pip
+%if 0%{?with_python3}
+BuildRequires:  python3-devel
+BuildRequires:  python3-setuptools
+BuildRequires:  python3-pip
+BuildRequires:  python3-pytz
+BuildRequires:  python3-dateutil
+%endif # if with_python3
 
 Requires:       pytz
 Requires:       python-dateutil
@@ -25,27 +36,75 @@ Python. It follows the RFC 2445 (iCalendar) specification.
 The aim is to make a package that is fully compliant with RFC 2445,
 well designed, simple to use and well documented.
 
+
+%if 0%{?with_python3}
+%package -n python3-icalendar
+Summary:        Parser/generator of iCalendar files following the RFC 2445 for Python 3
+Requires:       python3-pytz
+Requires:       python3-dateutil
+
+%description -n python3-icalendar
+Setuptools is a collection of enhancements to the Python 3 distutils that allow
+you to more easily build and distribute Python 3 packages, especially ones that
+have dependencies on other packages.
+
+This package contains the runtime components of setuptools, necessary to
+execute the software that requires pkg_resources.py.
+%endif # with_python3
+
 %prep
 %setup -q -n icalendar-%{version}%{?veradd}
 
+# we have only 2.7 and 3.3
+sed -i 's/py26,//' tox.ini
+
+%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
 %{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
 
+%if 0%{?with_python3}
+pushd %{py3dir}
+%{__python3} setup.py install --skip-build --root $RPM_BUILD_ROOT
+popd
+%endif # with_python3
+
 
-%check
-# not actually working, we need to package tox
-%{__python} setup.py test
+#check
+# commented out because tox tries to download stuff which doesn't work on koji
+# We need to define locale for tests otherwise python3-pip fails to decode
+# because it assumes ascii files
+#LC_ALL=en_US.UTF-8 tox
 
 %files
 %doc README.rst CHANGES.rst LICENSE.rst
 %{python_sitelib}/icalendar
 %{python_sitelib}/*.egg-info
 
+%if 0%{?with_python3}
+%files -n python3-icalendar
+%doc README.rst CHANGES.rst LICENSE.rst
+%{python3_sitelib}/icalendar
+%{python3_sitelib}/*.egg-info
+%endif # with_python3
+
 %changelog
+* Tue Jan 07 2014 Stanislav Ochotnicky <sochotnicky at rdhat.com> - 3.6.1-1
+- Update to latest upstream
+- Add python3 subpackage
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index 144e05a..cff801e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ddc8ea05e63ee37aaf414b4cfa53e3be  icalendar-3.4.tar.gz
+b6d465c86dfb354f1c9dac93f4a8a1d0  icalendar-3.6.1.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/python-icalendar.git/commit/?h=f20&id=7b1665739fbea29c7271fdc0a1c46fecd61d1cea