From 77561e0b6a8e462e109c923ca4b9f24fedea17f3 Mon Sep 17 00:00:00 2001
From: David Shea <dshea@redhat.com>
Date: Oct 05 2015 20:27:37 +0000
Subject: - Update to upstream version 0.10, which adds support for multiple configs

- Change to the new packaging guildelines which renames python-nose-testconfig to python2-nose-testconfig

---

diff --git a/.gitignore b/.gitignore
index d19bcb5..7f9ff02 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /nose-testconfig-0.9.tar.gz
+/nose-testconfig-0.10.tar.gz
diff --git a/python-nose-testconfig.spec b/python-nose-testconfig.spec
index 1b42b03..1bf2aee 100644
--- a/python-nose-testconfig.spec
+++ b/python-nose-testconfig.spec
@@ -1,11 +1,12 @@
+%global srcname nose-testconfig
 Name:           python-nose-testconfig
-Version:        0.9
-Release:        5%{?dist}
+Version:        0.10
+Release:        1%{?dist}
 Summary:        Test configuration plugin for nosetests
 
 License:        ASL 2.0
 URL:            https://bitbucket.org/jnoller/nose-testconfig/
-Source0:        https://pypi.python.org/packages/source/n/nose-testconfig/nose-testconfig-%{version}.tar.gz
+Source0:        https://pypi.python.org/packages/source/n/%{srcname}/%{srcname}-%{version}.tar.gz
 
 # Upstream does not include the license, which is required for redistribution
 # See https://bitbucket.org/jnoller/nose-testconfig/issue/10/
@@ -13,13 +14,29 @@ Source1:        LICENSE-2.0
 
 BuildArch:      noarch
 
-BuildRequires:  python2-devel, python3-devel
-BuildRequires:  python-setuptools, python3-setuptools
+%description
+nose-testconfig is a plugin to the nose test framework which provides a
+faculty for passing test-specific (or test-run specific) configuration data
+to the tests being executed.
+
+Currently configuration files in the following formats are supported:
+
+- YAML (via PyYAML <http://pypi.python.org/pypi/PyYAML/>)
+- INI (via ConfigParser <http://docs.python.org/lib/module-ConfigParser.html>)
+- Pure Python (via Exec)
+- JSON (via JSON <http://docs.python.org/library/json.html>)
+
+%package -n python2-%{srcname}
+Summary:        Test configuration plugin for nosetests for Python2
+%{?python_provide:%python_provide python2-%{srcname}}
+
+BuildRequires:  python2-devel
+BuildRequires:  python-setuptools
 
 Requires:       python-nose
 Requires:       PyYAML
 
-%description
+%description -n python2-%{srcname}
 nose-testconfig is a plugin to the nose test framework which provides a
 faculty for passing test-specific (or test-run specific) configuration data
 to the tests being executed.
@@ -31,12 +48,19 @@ Currently configuration files in the following formats are supported:
 - Pure Python (via Exec)
 - JSON (via JSON <http://docs.python.org/library/json.html>)
 
-%package -n python3-nose-testconfig
+This is the Python 2 version of the package.
+
+%package -n python3-%{srcname}
 Summary:        Test configuration plugin for nosetests for Python3
+%{?python_provide:%python_provide python3-%{srcname}}
+
+BuildRequires:  python3-devel
+BuildRequires:  python3-setuptools
+
 Requires:       python3-nose
 Requires:       python3-PyYAML
 
-%description -n python3-nose-testconfig
+%description -n python3-%{srcname}
 nose-testconfig is a plugin to the nose test framework which provides a
 faculty for passing test-specific (or test-run specific) configuration data
 to the tests being executed.
@@ -48,30 +72,28 @@ Currently configuration files in the following formats are supported:
 - Pure Python (via Exec)
 - JSON (via JSON <http://docs.python.org/library/json.html>)
 
+This is the Python 3 version of the package.
+
 %prep
-%setup -q -n nose-testconfig-%{version}
+%autosetup -n %{srcname}-%{version}
 rm -rf nose_testconfig.egg-info
 cp %{SOURCE1} .
 
-rm -rf %{py3dir}
-cp -a . %{py3dir}
-
 %build
-%{__python2} setup.py build
-
-( cd %{py3dir} && %{__python3} setup.py build )
+%py2_build
+%py3_build
 
 %install
-%{__python2} setup.py install --skip-build --root %{buildroot}
-( cd %{py3dir} && %{__python3} setup.py install --skip-build --root %{buildroot} )
+%py2_install
+%py3_install
 
-%files
+%files -n python2-%{srcname}
 %license LICENSE-2.0
 %doc ACKS TODO docs/index.txt
 %{python2_sitelib}/testconfig.py*
 %{python2_sitelib}/nose_testconfig-%{version}-*.egg-info
 
-%files -n python3-nose-testconfig
+%files -n python3-%{srcname}
 %license LICENSE-2.0
 %doc ACKS TODO docs/index.txt
 %{python3_sitelib}/testconfig.py*
@@ -79,6 +101,10 @@ cp -a . %{py3dir}
 %{python3_sitelib}/nose_testconfig-%{version}-*.egg-info
 
 %changelog
+* Mon Oct  5 2015 David Shea <dshea@redhat.com> - 0.10-1
+- Update to upstream version 0.10, which adds support for multiple configs
+- Change to the new packaging guildelines which renames python-nose-testconfig to python2-nose-testconfig
+
 * Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 
diff --git a/sources b/sources
index ee57416..5976249 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bd4480f8685cf6500058f9d94f672e35  nose-testconfig-0.9.tar.gz
+2ff0a26ca9eab962940fa9b1b8e97995  nose-testconfig-0.10.tar.gz