[python-paver/f18] Update to upstream 1.2.0 release

[Toshio くらとみ]

commit 25ea2e6ad56a2be7c6f3c19b1b61228cdea70e71
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Mon Feb 25 16:41:26 2013 -0800

    Update to upstream 1.2.0 release
    
    - samefile patch merged upstream
    - Patch to unbundle included python-six
    - Disable cog as it's not packaged yet
    - Remove the unittests from the binary rpm

 .gitignore        |    1 +
 python-paver.spec |   26 +++++++++++++++++++-------
 sources           |    2 +-
 3 files changed, 21 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index cd7977e..54488da 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ Paver-1.0.3.tar.gz
 /Paver-1.0.5.tar.gz
 /Paver-1.1.0.tar.gz
 /Paver-1.1.1.tar.gz
+/Paver-1.2.0.tar.gz
diff --git a/python-paver.spec b/python-paver.spec
index 93d7317..3fbf4c5 100644
--- a/python-paver.spec
+++ b/python-paver.spec
@@ -4,8 +4,8 @@
 
 %global srcname Paver
 Name: python-paver
-Version: 1.1.1
-Release: 2%{?dist}
+Version: 1.2.0
+Release: 1%{?dist}
 Summary: Python-based build/distribution/deployment scripting tool
 
 Group: Development/Languages
@@ -14,10 +14,8 @@ Group: Development/Languages
 License: BSD and (MIT or GPLv2)
 URL: http://www.blueskyonmars.com/projects/paver/
 Source0: http://pypi.python.org/packages/source/P/%{srcname}/%{srcname}-%{version}.tar.gz
-# Fix call to os.path.samefile
-# Submitted upstream https://github.com/paver/paver/pull/86
-# (Code has changed a little but this patch is the equivalent)
-Patch0: paver-samefile-fix.patch
+# Unbundle python-six
+Patch0: paver-unbundle.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch: noarch
@@ -25,9 +23,12 @@ BuildRequires: python2-devel
 BuildRequires: python-setuptools
 BuildRequires: python-sphinx
 BuildRequires: python-nose
+BuildRequires: python-six
+BuildRequires: python-mock
 
 Requires:      python2-devel
 Requires:      python-setuptools
+Requires: python-six
 
 %description
 Paver is a Python-based build/distribution/deployment scripting tool along the
@@ -60,6 +61,8 @@ now much easier.
 
 %patch0 -p1
 
+rm paver/deps/six*
+
 # Note: This falls somewhere in between source and non-source.  It's a copy
 # of the essential files from the library that's being packaged.  But it's
 # zipped up.  For us, the paver command should find the uninstalled paver
@@ -70,7 +73,8 @@ rm paver-minilib.zip
 %{__python} setup.py build
 
 %check
-nosetests
+# Disable the two cog tests as python-cog(app) is not packaged for Fedora
+nosetests -e test_cogging -e test_cogging_with_markers_removed
 
 %install
 rm -rf %{buildroot}
@@ -85,9 +89,17 @@ rm -rf %{buildroot}
 %doc LICENSE.txt README.rst
 %{_bindir}/*
 %{python_sitelib}/*
+%exclude %{python_sitelib}/paver/tests
 
 
 %changelog
+* Mon Feb 25 2013 Toshio Kuratomi <toshio at fedoraproject.org> - 1.2.0-1
+- Update to upstream 1.2.0 release
+- samefile patch merged upstream
+- Patch to unbundle included python-six
+- Disable cog as it's not packaged yet
+- Remove the unittests from the binary rpm
+
 * Thu Jan 10 2013 Toshio Kuratomi <toshio at fedoraproject.org> - 1.1.1-2
 - Fix paver's use of os.path.samefile
 
diff --git a/sources b/sources
index af35c8c..c2ad7e0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-dcc0d1ffa052a8b8f5efcd781a841c26  Paver-1.1.1.tar.gz
+96d5c962347a47590626aad2bf7a34a0  Paver-1.2.0.tar.gz