From e07650248785550c411a69da696afd5f506ab5f8 Mon Sep 17 00:00:00 2001
From: Steve 'Ashcrow' Milner <stevem@gnulinux.net>
Date: Oct 16 2010 15:36:38 +0000
Subject: Merge branch 'master' into el5


---

diff --git a/.gitignore b/.gitignore
index 23248c1..57331e6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 virtualenv-1.4.8.tar.gz
+/virtualenv-1.5.1.tar.gz
diff --git a/python-virtualenv.spec b/python-virtualenv.spec
index b072549..f13718a 100644
--- a/python-virtualenv.spec
+++ b/python-virtualenv.spec
@@ -2,8 +2,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-virtualenv
-Version:        1.4.8
-Release:        3%{?dist}
+Version:        1.5.1
+Release:        1%{?dist}
 Summary:        Tool to create isolated Python environments
 
 Group:          Development/Languages
@@ -58,6 +58,16 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* 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.
+- Uses a proper temporary dir when installing environment requirements.
+- Add --prompt option to be able to override the default prompt prefix.
+- Add fish and csh activate scripts.
+
+* Thu Jul 22 2010 David Malcolm <dmalcolm@redhat.com> - 1.4.8-4
+- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
+
 * Tue Jul  7 2010 Steve 'Ashcrow' Milner <me@stevemilner.org> - 1.4.8-3
 - Fixed EPEL installation issue from BZ#611536
 
diff --git a/sources b/sources
index b0b425b..b05e9db 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-74ded4025a56e538c1c8df6b9825a8b8  virtualenv-1.4.8.tar.gz
+3daa1f449d5d2ee03099484cecb1c2b7  virtualenv-1.5.1.tar.gz