[python-taskw: 2/2] 0.7.1

[Ralph Bean]

commit 8efc8a68f1dc40062f3cc3e5ac82daaaa34eb316
Author: Ralph Bean <rbean at redhat.com>
Date:   Tue Jan 21 10:29:31 2014 -0500

    0.7.1

 .gitignore        |    1 +
 python-taskw.spec |   31 ++++++++++++++++++++++---------
 sources           |    2 +-
 3 files changed, 24 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b99e29c..fbc0f43 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /taskw-0.4.3.tar.gz
 /taskw-0.6.1.tar.gz
+/taskw-0.7.1.tar.gz
diff --git a/python-taskw.spec b/python-taskw.spec
index 7bb767c..6292945 100644
--- a/python-taskw.spec
+++ b/python-taskw.spec
@@ -1,12 +1,17 @@
-
-%if 0%{?fedora} > 12 || 0%{?rhel} > 6
+%if 0%{?fedora}
 %global with_python3 1
 %endif
 
+%if 0%{?rhel} && 0%{?rhel} <= 6
+%{!?__python2:        %global __python2 /usr/bin/python2}
+%{!?python2_sitelib:  %global python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
+%{!?python2_sitearch: %global python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
+%endif
+
 %global modname taskw
 
 Name:             python-taskw
-Version:          0.6.1
+Version:          0.7.1
 Release:          1%{?dist}
 Summary:          Python bindings for your taskwarrior database
 
@@ -22,8 +27,10 @@ BuildRequires:    python2-devel
 BuildRequires:    python-setuptools
 BuildRequires:    python-nose
 BuildRequires:    python-six
+BuildRequires:    task
 
 Requires:         python-six
+Requires:         task
 
 %if %{?rhel}%{!?rhel:0} >= 6
 BuildRequires:    python-ordereddict
@@ -47,6 +54,7 @@ Summary:        Python bindings for your taskwarrior database
 Group:          Development/Libraries
 
 Requires:       python3-six
+Requires:       task
 
 %description -n python3-taskw
 This is a python API for the `taskwarrior <http://taskwarrior.org>`_
@@ -62,7 +70,7 @@ cp -a . %{py3dir}
 %endif
 
 %build
-%{__python} setup.py build
+%{__python2} setup.py build
 
 %if 0%{?with_python3}
 pushd %{py3dir}
@@ -76,10 +84,10 @@ pushd %{py3dir}
 %{__python3} setup.py install -O1 --skip-build --root=%{buildroot}
 popd
 %endif
-%{__python} setup.py install -O1 --skip-build --root=%{buildroot}
+%{__python2} setup.py install -O1 --skip-build --root=%{buildroot}
 
 %check
-%{__python} setup.py test
+%{__python2} setup.py test
 
 %if 0%{?with_python3}
 pushd %{py3dir}
@@ -88,12 +96,12 @@ popd
 %endif
 
 # Remove the tests after we've run them.  No reason to ship them.
-%{__rm} -r %{buildroot}%{python_sitelib}/%{modname}/test
+%{__rm} -r %{buildroot}%{python2_sitelib}/%{modname}/test
 
 %files
 %doc README.rst LICENSE.txt
-%{python_sitelib}/%{modname}
-%{python_sitelib}/%{modname}-%{version}*
+%{python2_sitelib}/%{modname}
+%{python2_sitelib}/%{modname}-%{version}*
 
 %if 0%{?with_python3}
 %files -n python3-%{modname}
@@ -105,6 +113,11 @@ popd
 
 
 %changelog
+* Tue Jan 21 2014 Ralph Bean <rbean at redhat.com> - 0.7.1-1
+- Latest upstream.
+- Modernized python macros.
+- Added dep on task as the default mode now shells out to commands.
+
 * Fri Nov 29 2013 Pierre-Yves Chibon <pingou at pingoured.fr> - 0.6.1-1
 - Update to release 0.6.1
 
diff --git a/sources b/sources
index 56fa58f..36c7789 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-996016abe3f8fedac1a18b423321d389  taskw-0.6.1.tar.gz
+66e2ea5827bd64fdd59b2c77c5e77ddc  taskw-0.7.1.tar.gz