diff --git a/.gitignore b/.gitignore index fa17fef..c4d9213 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /pkgwat.api-0.5.tar.gz /pkgwat.api-0.6.tar.gz /pkgwat.api-0.7.tar.gz +/pkgwat.api-0.8.tar.gz diff --git a/python-pkgwat-api-py3.2-friendly.patch b/python-pkgwat-api-py3.2-friendly.patch deleted file mode 100644 index 5170971..0000000 --- a/python-pkgwat-api-py3.2-friendly.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 72c111cd88cb3bcff7b25215ac9dff319c45def4 Mon Sep 17 00:00:00 2001 -From: Ralph Bean -Date: Thu, 28 Feb 2013 11:06:07 -0500 -Subject: [PATCH] Py3.2-friendly. - ---- - pkgwat/api/__init__.py | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/pkgwat/api/__init__.py b/pkgwat/api/__init__.py -index 9eac1c0..315f500 100644 ---- a/pkgwat/api/__init__.py -+++ b/pkgwat/api/__init__.py -@@ -648,7 +648,7 @@ def dependencies(package, arch="noarch", release="Rawhide", version=None, - return [] - - version = relevant_releases[0]['stable_version'] -- if version == u'None': -+ if version == 'None': - version = relevant_releases[0]['testing_version'] - - path = "yum/query/query_requires" -@@ -704,7 +704,7 @@ def dependants(package, arch="noarch", release="Rawhide", version=None, - return [] - - version = relevant_releases[0]['stable_version'] -- if version == u'None': -+ if version == 'None': - version = relevant_releases[0]['testing_version'] - - path = "yum/query/query_required_by" -@@ -763,7 +763,7 @@ def provides(package, arch="noarch", release="Rawhide", version=None, - return [] - - version = relevant_releases[0]['stable_version'] -- if version == u'None': -+ if version == 'None': - version = relevant_releases[0]['testing_version'] - - path = "yum/query/query_provides" -@@ -799,7 +799,7 @@ def obsoletes(package, arch="noarch", release="Rawhide", version=None, - return [] - - version = relevant_releases[0]['stable_version'] -- if version == u'None': -+ if version == 'None': - version = relevant_releases[0]['testing_version'] - - path = "yum/query/query_obsoletes" -@@ -835,7 +835,7 @@ def conflicts(package, arch="noarch", release="Rawhide", version=None, - return [] - - version = relevant_releases[0]['stable_version'] -- if version == u'None': -+ if version == 'None': - version = relevant_releases[0]['testing_version'] - - path = "yum/query/query_conflicts" --- -1.8.1.2 - diff --git a/python-pkgwat-api.spec b/python-pkgwat-api.spec index c65679d..88098aa 100644 --- a/python-pkgwat-api.spec +++ b/python-pkgwat-api.spec @@ -5,15 +5,14 @@ %global modname pkgwat.api Name: python-pkgwat-api -Version: 0.7 -Release: 3%{?dist} +Version: 0.8 +Release: 1%{?dist} Summary: Python API for querying the fedora packages webapp Group: Development/Libraries License: LGPLv2+ URL: http://pypi.python.org/pypi/pkgwat.api Source0: http://pypi.python.org/packages/source/p/%{modname}/%{modname}-%{version}.tar.gz -Patch0: python-pkgwat-api-py3.2-friendly.patch BuildArch: noarch @@ -28,6 +27,11 @@ BuildRequires: python3-setuptools Requires: python-six Requires: python-requests +%if 0%{?rhel} +BuildRequires: python-ordereddict +Requires: python-ordereddict +%endif + %description Python API for pkgwat http://pypi.python.org/pypi/pkgwat.cli @@ -48,7 +52,6 @@ http://pypi.python.org/pypi/pkgwat.cli. %prep %setup -q -n %{modname}-%{version} -%patch0 -p1 rm -rf pkgwat.api.egg-info @@ -88,6 +91,11 @@ popd %endif %changelog +* Tue Apr 09 2013 Ralph Bean - 0.8-1 +- Latest upstream with a bugfix for py2.6. +- Conditionally depend on python-ordereddict. +- Remove py3.2 patch. Now included in upstream's release. + * Wed Mar 20 2013 Ralph Bean - 0.7-3 - Correctly name the python3 subpackage. diff --git a/sources b/sources index acff54d..06cc6fa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e8b00ac116692ffa1f9d7fc3b98c1950 pkgwat.api-0.7.tar.gz +aa3de897a74e942799cdbff9ada3c398 pkgwat.api-0.8.tar.gz