From 6638d6f85d4f08930693c870c3834b7810ccd927 Mon Sep 17 00:00:00 2001
From: Steve 'Ashcrow' Milner <stevem@gnulinux.net>
Date: Dec 20 2011 17:29:28 +0000
Subject: Merge branch 'master' into el5


---

diff --git a/.gitignore b/.gitignore
index 57331e6..927b275 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 virtualenv-1.4.8.tar.gz
 /virtualenv-1.5.1.tar.gz
+/virtualenv-1.7.tar.gz
diff --git a/python-virtualenv.spec b/python-virtualenv.spec
index f13718a..7f9d027 100644
--- a/python-virtualenv.spec
+++ b/python-virtualenv.spec
@@ -2,7 +2,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-virtualenv
-Version:        1.5.1
+Version:        1.7
 Release:        1%{?dist}
 Summary:        Tool to create isolated Python environments
 
@@ -19,7 +19,7 @@ Requires:       python-setuptools, python-devel
 # Fedora requires python-setuptools-devel while EL5 fails on install
 # See BZ#611536 (https://bugzilla.redhat.com/show_bug.cgi?id=611536)
 %if 0%{?fedora} > 0
-BuildRequires:  python-setuptools-devel
+BuildRequires:  python-setuptools-devel, python-sphinx
 Requires:       python-setuptools-devel
 %endif
 
@@ -37,27 +37,44 @@ licensed under an MIT-style permissive license.
 
 
 %build
+# Build code
 %{__python} setup.py build
 
+# Build docs on Fedora
+%if 0%{?fedora} > 0
+%{__python} setup.py build_sphinx
+%endif
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
+rm -f build/sphinx/html/.buildinfo
+
 
- 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
 %files
 %defattr(-,root,root,-)
-%doc docs/index.txt docs/license.txt docs/news.txt PKG-INFO
+%doc docs/*txt PKG-INFO AUTHORS.txt LICENSE.txt HACKING
+# Include sphinx docs on Fedora
+%if 0%{?fedora} > 0
+%doc build/sphinx/*
+%endif
 # For noarch packages: sitelib
 %{python_sitelib}/*
 %attr(755,root,root) %{_bindir}/virtualenv
 
 
 %changelog
+* Tue Dec 20 2011 Steve 'Ashcrow' Milner <me@stevemilner.org> - 1.7-1
+- Update for https://bugzilla.redhat.com/show_bug.cgi?id=769067
+
+* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
 * Sat Oct 16 2010 Steve 'Ashcrow' Milner <me@stevemilner.org> - 1.5.1-1
 - Added _weakrefset requirement for Python 2.7.1.
 - Add support for PyPy.
diff --git a/sources b/sources
index b05e9db..7941c69 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3daa1f449d5d2ee03099484cecb1c2b7  virtualenv-1.5.1.tar.gz
+dcc105e5a3907a9dcaa978f813a4f526  virtualenv-1.7.tar.gz