From df536bf725fdfe95b87c04b83fe8a9a891a18067 Mon Sep 17 00:00:00 2001
From: Luke Macken <lmacken@redhat.com>
Date: Thu, 26 Jun 2014 12:45:25 -0600
Subject: [PATCH] Update to 5.0.5 (#1113538, #1066388)

---
 .gitignore            |   2 +
 python-configobj.spec | 102 ++++++++++++++++++++++++++++++++++++++----
 sources               |   3 +-
 3 files changed, 98 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index ec44c3d..1a91124 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
 configobj-4.7.2.zip
+/configobj-5.0.5.tar.gz
+/configobj-5.0.5-tests.tar.gz
diff --git a/python-configobj.spec b/python-configobj.spec
index c2353b0..3c24bcf 100644
--- a/python-configobj.spec
+++ b/python-configobj.spec
@@ -2,20 +2,33 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %endif
 
+%if 0%{?fedora}
+%global with_python3 1
+%endif
+
 Name:           python-configobj
-Version:        4.7.2
-Release:        8%{?dist}
+Version:        5.0.5
+Release:        1%{?dist}
 Summary:        Config file reading, writing, and validation
 
 Group:          System Environment/Libraries
 License:        BSD
-URL:            http://www.voidspace.org.uk/python/configobj.html
-Source0:        http://www.voidspace.org.uk/downloads/configobj-%{version}.zip
+URL:            http://configobj.readthedocs.org/
+Source0:        https://pypi.python.org/packages/source/c/configobj/configobj-%{version}.tar.gz
+# to get tests
+# git clone https://github.com/DiffSK/configobj.git && cd configobj
+# git checkout v5.0.5
+# tar -czf configobj-5.0.5-tests.tar.gz tests/ test_configobj.py
+Source1:        configobj-%{version}-tests.tar.gz
 Patch0:         configobj-import-all-fix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-BuildRequires: python-devel
+BuildRequires:  python-devel
+BuildRequires:  python-six
+BuildRequires:  pytest
+
+Requires:       python-six
 
 %description
 ConfigObj is a simple but powerful config file reader and writer: an ini file
@@ -36,32 +49,105 @@ It has lots of other features though:
     * Full Unicode support
     * A powerful unrepr mode for storing basic datatypes
 
+%if 0%{?with_python3}
+%package -n python3-configobj
+Summary:        Config file reading, writing, and validation for Python 3
+
+BuildRequires:  python3-devel
+BuildRequires:  python3-six
+BuildRequires:  python3-pytest
+
+Requires:       python3-six
+
+%description -n python3-configobj
+ConfigObj is a simple but powerful config file reader and writer: an ini file
+round tripper. Its main feature is that it is very easy to use, with a
+straightforward programmer's interface and a simple syntax for config files. 
+It has lots of other features though:
+    * Nested sections (subsections), to any level
+    * List values
+    * Multiple line values
+    * String interpolation (substitution)
+    * Integrated with a powerful validation system
+          o including automatic type checking/conversion
+          o repeated sections
+          o and allowing default values
+    * All comments in the file are preserved
+    * The order of keys/sections is preserved
+    * No external dependencies
+    * Full Unicode support
+    * A powerful unrepr mode for storing basic datatypes
+
+This package ships Python 3 build of configobj.
+%endif
+
 
 %prep
 %setup -q -n configobj-%{version}
 %patch0 -p1 -b .all
 
+%if 0%{?with_python3}
+rm -rf %{py3dir}
+cp -a . %{py3dir}
+%endif
+
 %build
 %{__python} setup.py build
 
+%if 0%{?with_python3}
+pushd %{py3dir}
+%{__python3} setup.py build
+popd
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install --skip-build --root=$RPM_BUILD_ROOT
 
+%if 0%{?with_python3}
+pushd %{py3dir}
+%{__python3} setup.py install --skip-build --root %{buildroot}
+popd
+%endif
+
 %check
-export PYTHONPATH="%{buildroot}/%{python_sitelib}"
-%{__python} tests/test_configobj.py
+# this needs to be set for tests.test_configobj.test_options_deprecation
+export PYTHONWARNINGS=always
+
+tar -xzf %{SOURCE1}
+%{__python} test_configobj.py
+py.test tests
+
+%if 0%{?with_python3}
+pushd %{py3dir}
+tar -xzf %{SOURCE1}
+%{__python3} test_configobj.py
+py.test-%{python3_version} tests
+popd
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
+# no docs untile upstream puts them in sdist again:
+#  https://github.com/DiffSK/configobj/issues/63
 %defattr(-,root,root,-)
-%doc docs/*
 %{python_sitelib}/*
 
+%if 0%{?with_python3}
+%files -n python3-configobj
+%defattr(-,root,root,-)
+%{python3_sitelib}/*
+%endif
+
+
 %changelog
+* Thu Jun 26 2014 Bohuslav Kabrda <bkabrda@redhat.com> - 5.0.5-1
+- Updated to 5.0.5 (new upstream "with the blessing of original creator")
+- Introduced python3-configobj subpackage
+- Changed upstream url to documentation written by new upstream
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.7.2-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index e55a682..e47eb2b 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-51cee395cfbf831339b03f72706de18e  configobj-4.7.2.zip
+00af246754b4bb41a4e9c625c60dca5c  configobj-5.0.5.tar.gz
+1083571db31df6f56250b1dc78ae861c  configobj-5.0.5-tests.tar.gz