From b8f7535dcc6d60b6d16b13c6ba1d84ea7c179c42 Mon Sep 17 00:00:00 2001
From: Thomas Moschny <thm@fedoraproject.org>
Date: Thu, 27 Aug 2009 18:33:46 +0000
Subject: [PATCH] Update to 1.0.2.

---
 .cvsignore     |  2 +-
 import.log     |  1 +
 python-py.spec | 37 +++++++++++++++++++++++--------------
 sources        |  2 +-
 4 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 1ae95d8..ca62d9d 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-py-1.0.0.tar.gz
+py-1.0.2.tar.gz
diff --git a/import.log b/import.log
index 0d80647..ee64d02 100644
--- a/import.log
+++ b/import.log
@@ -1,3 +1,4 @@
 python-py-0_9_2-6_fc10:HEAD:python-py-0.9.2-6.fc10.src.rpm:1232104910
 python-py-1_0_0-0_b8_fc11:HEAD:python-py-1.0.0-0.b8.fc11.src.rpm:1248303215
 python-py-1_0_0-1_fc11:HEAD:python-py-1.0.0-1.fc11.src.rpm:1250184682
+python-py-1_0_2-1_fc11:HEAD:python-py-1.0.2-1.fc11.src.rpm:1251397988
diff --git a/python-py.spec b/python-py.spec
index c1ea372..3303f18 100644
--- a/python-py.spec
+++ b/python-py.spec
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-py
-Version:        1.0.0
+Version:        1.0.2
 Release:        1%{?prerelease:.%{prerelease}}%{?dist}
 Summary:        Innovative python library containing py.test, greenlets and other niceties
 Group:          Development/Languages
@@ -9,7 +9,7 @@ License:        MIT and LGPLv2+ and Public Domain and BSD and Python
 #               - main package: MIT, except:
 #                 - test/rsession/webdata/json.py: LPGLv2+
 #                 - doc/style.css: Public Domain
-#                 - test/web/post_multipart.py: Python 
+#                 - test/web/post_multipart.py: Python
 #                   (see http://code.activestate.com/help/terms)
 #                 - compat/textwrap.py: Python
 #                 - compat/subprocess.py: Python
@@ -65,27 +65,29 @@ find %{buildroot}%{python_sitelib} \( -name '*.py' -o -name 'py.*' \) \
 # move some txt files to the doc directory
 mkdir -p %{doctarget}
 mv %{buildroot}%{python_sitelib}/py/LICENSE %{doctarget}
-mv %{buildroot}%{python_sitelib}/py/compat/LICENSE %{doctarget}/compat_LICENSE
-mv %{buildroot}%{python_sitelib}/py/execnet/NOTES %{doctarget}/execnet_NOTES
-mv %{buildroot}%{python_sitelib}/py/execnet/improve-remote-tracebacks.txt \
-   %{doctarget}/execnet_improve-remote-tracebacks.txt
-mv %{buildroot}%{python_sitelib}/py/path/gateway/TODO.txt %{doctarget}/path_gateway_TODO.txt
-mv %{buildroot}%{python_sitelib}/py/path/svn/quoting.txt %{doctarget}/svn_quoting_path.txt
-cp -pr doc example contrib %{doctarget}
+# files are not in the 1.0.2 tarball, but might again be there in
+# later releases:
+#mv %{buildroot}%{python_sitelib}/py/compat/LICENSE %{doctarget}/compat_LICENSE
+#mv %{buildroot}%{python_sitelib}/py/execnet/NOTES %{doctarget}/execnet_NOTES
+#mv %{buildroot}%{python_sitelib}/py/execnet/improve-remote-tracebacks.txt \
+#   %{doctarget}/execnet_improve-remote-tracebacks.txt
+#mv %{buildroot}%{python_sitelib}/py/path/gateway/TODO.txt %{doctarget}/path_gateway_TODO.txt
+#mv %{buildroot}%{python_sitelib}/py/path/svn/quoting.txt %{doctarget}/svn_quoting_path.txt
+cp -pr README.txt doc example contrib %{doctarget}
 
 # remove this and that
 find %{buildroot}%{python_sitelib} -name '*.cmd' -exec rm {} \;
 
-# remove (most) files only used by the testsuite
+# remove (most) files only used by the testsuite - upstream plans on
+# separating that out for the 1.1 version
 #find %{buildroot}%{python_sitelib} -type d -name testing -prune -exec rm -r {} \;
 #find %{buildroot}%{python_sitelib} -name 'conftest.py*' -exec rm {} \;
 
 
 %check
-# some tests need to be skipped currently
-PYTHONPATH=$(pwd)/py %{__python} py/bin/py.test \
-  '-k-test_make_sdist_and_run_it' \
-  py
+# test cannot be run in %{buildroot}, because it uses
+# inspect.getsourcefile() et. al.
+PYTHONPATH=$(pwd)/py %{__python} py/bin/py.test py
 
 
 %clean
@@ -100,6 +102,13 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Aug 27 2009 Thomas Moschny <thomas.moschny@gmx.de> - 1.0.2-1
+- Update to 1.0.2.
+- One failing test is no longer part of the testsuite, thus needs not
+  to be skipped anymore.
+- Some developer docs are missing this time in upstream's tarfile, so
+  cannot be moved to %%{_docdir}
+
 * Thu Aug 13 2009 Thomas Moschny <thomas.moschny@gmx.de> - 1.0.0-1
 - Update to 1.0.0.
 - Re-enable SVN tests in %%check.
diff --git a/sources b/sources
index 4719a5c..cb364bd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3223ff8fcaefd060be13262e367794ce  py-1.0.0.tar.gz
+4d2e9878b0113159fae2f3ed0cfc081d  py-1.0.2.tar.gz