[python-wheel] Update to 0.24.0

[Bohuslav Kabrda]

commit 1b1515bf64f5da7eadbed0775dc5a58185f641c0
Author: Slavek Kabrda <bkabrda at redhat.com>
Date:   Mon Nov 10 12:34:30 2014 +0100

    Update to 0.24.0
    
    - Remove patches merged upstream

 .gitignore                                       |    1 +
 python-wheel.spec                                |   23 +++++++--------------
 sources                                          |    2 +-
 wheel-0.22-add-test-files-to-manifest.path       |   11 ----------
 wheel-0.22-fix-tests-broken-by-keyring-fix.patch |   19 ------------------
 wheel-0.22-legacy-keyring-compatibility.patch    |   19 ------------------
 6 files changed, 10 insertions(+), 65 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d0e5913..81071c1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /wheel-0.22.0.tar.gz
+/wheel-0.24.0.tar.gz
diff --git a/python-wheel.spec b/python-wheel.spec
index 2e104ed..75a6f11 100644
--- a/python-wheel.spec
+++ b/python-wheel.spec
@@ -3,8 +3,8 @@
 %global with_python3 1
 
 Name:           python-%{pypi_name}
-Version:        0.22.0
-Release:        4%{?dist}
+Version:        0.24.0
+Release:        1%{?dist}
 Summary:        A built-package format for Python
 
 License:        MIT
@@ -17,9 +17,6 @@ Source0:        https://pypi.python.org/packages/source/w/%{pypi_name}/%{pypi_na
 #  correct testing wheel)
 Source1:        https://bitbucket.org/dholth/wheel/src/099352e/wheel/test/test-1.0-py2.py3-none-win32.whl
 Source2:        https://bitbucket.org/dholth/wheel/raw/099352e/wheel/test/pydist-schema.json
-Patch0:         wheel-0.22-add-test-files-to-manifest.path
-Patch1:         wheel-0.22-legacy-keyring-compatibility.patch
-Patch2:         wheel-0.22-fix-tests-broken-by-keyring-fix.patch
 BuildArch:      noarch
  
 BuildRequires:  python-devel
@@ -60,10 +57,6 @@ This is package contains Python 3 version of the package.
 %prep
 %setup -q -n %{pypi_name}-%{version}
 
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-
 # copy test files in place
 cp %{SOURCE1} %{pypi_name}/test/
 cp %{SOURCE2} %{pypi_name}/test/
@@ -108,36 +101,36 @@ popd
 %check
 # remove setup.cfg that makes pytest require pytest-cov (unnecessary dep)
 rm setup.cfg
-py.test --ignore build
+PYTHONPATH=$(pwd) py.test --ignore build
 # no test for Python 3, no python3-jsonschema yet
 %if 0
 pushd %{py3dir}
 rm setup.cfg
-py.test-%{python3_version} --ignore build
+PYTHONPATH=$(pwd) py.test-%{python3_version} --ignore build
 popd
 %endif # with_python3
 
 
 %files
 %doc LICENSE.txt CHANGES.txt README.txt
-%{_bindir}/egg2wheel
 %{_bindir}/wheel
-%{_bindir}/wininst2wheel
 %{python_sitelib}/%{pypi_name}*
 %exclude %{python_sitelib}/%{pypi_name}/test
 %if 0%{?with_python3}
 
 %files -n python3-%{pypi_name}
 %doc LICENSE.txt CHANGES.txt README.txt
-%{_bindir}/python3-egg2wheel
 %{_bindir}/python3-wheel
-%{_bindir}/python3-wininst2wheel
 %{python3_sitelib}/%{pypi_name}*
 %exclude %{python3_sitelib}/%{pypi_name}/test
 %endif # with_python3
 
 
 %changelog
+* Mon Nov 10 2014 Slavek Kabrda <bkabrda at redhat.com> - 0.24.0-1
+- Update to 0.24.0
+- Remove patches merged upstream
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.22.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index ffb19c8..374e014 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-16bb8eb3bdd3d93813295463bb949705  wheel-0.22.0.tar.gz
+3b0d66f0d127ea8befaa5d11453107fd  wheel-0.24.0.tar.gz