[python26-virtualenv/el5/master] import SRPM from approved package instead of older one

[mmckinst]

commit 26332d034f1524dd9632bd269a2040248287bf0e
Author: mmckinst <mmckinst at fedroa14.markmck.com>
Date:   Fri Mar 4 10:32:09 2011 -0500

    import SRPM from approved package instead of older one

 python26-virtualenv.spec |   28 +++++++++++++++++-----------
 1 files changed, 17 insertions(+), 11 deletions(-)
---
diff --git a/python26-virtualenv.spec b/python26-virtualenv.spec
index 4dc6d9a..18aa491 100644
--- a/python26-virtualenv.spec
+++ b/python26-virtualenv.spec
@@ -1,12 +1,14 @@
-%global __python_ver 26
-%global __python %{_bindir}/python2.6
+%global pyver 26
+%global pybasever 2.6
+
+%global __python %{_bindir}/python%{pybasever}
 %global __os_install_post %{__python26_os_install_post}
 
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
-Name:           python%{?__python_ver}-virtualenv
+Name:           python%{pyver}-virtualenv
 Version:        1.5.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Tool to create isolated Python environments
 
 Group:          Development/Languages
@@ -16,8 +18,8 @@ Source0:        http://pypi.python.org/packages/source/v/virtualenv/virtualenv-%
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  python%{?__python_ver}-devel
-Requires:       python%{?__python_ver}-distribute, python%{?__python_ver}-devel
+BuildRequires:  python%{pyver}-devel
+Requires:       python%{pyver}-distribute, python%{pyver}-devel
 
 %description
 virtualenv is a tool to create isolated Python environments. virtualenv
@@ -36,13 +38,13 @@ licensed under an MIT-style permissive license.
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
+rm -rf %{buildroot}
+%{__python} setup.py install --skip-build --root %{buildroot}
 
-mv %{buildroot}/%{_bindir}/virtualenv %{buildroot}/%{_bindir}/virtualenv-2.6
+mv %{buildroot}/%{_bindir}/virtualenv %{buildroot}/%{_bindir}/virtualenv-%{pybasever}
  
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %files
@@ -50,10 +52,14 @@ rm -rf $RPM_BUILD_ROOT
 %doc docs/index.txt docs/license.txt docs/news.txt PKG-INFO
 # For noarch packages: sitelib
 %{python_sitelib}/*
-%attr(755,root,root) %{_bindir}/virtualenv-2.6
+%attr(755,root,root) %{_bindir}/virtualenv-%{pybasever}
 
 
 %changelog
+* Thu Feb 24 2011 Mark McKinstry <mmckinst at nexcess.net> - 1.5.1-3
+- make macros use consistent
+- use a macro for all the hard coded '2.6' stuff
+
 * Fri Jan 28 2011 Mark McKinstry <mmckinst at nexcess.net> - 1.5.1-2
 - repackage for python26 in EPEL 5