[django-evolution] Resolves: rhbz#720056 - file conflict python-paste-deploy x django-evolution Remove tests from insta

Stephen Gallagher sgallagh at fedoraproject.org
Mon Jul 11 21:02:04 UTC 2011


commit c6a30886801d39705da3113add68472670f518d5
Author: Stephen Gallagher <sgallagh at redhat.com>
Date:   Mon Jul 11 17:01:52 2011 -0400

    Resolves: rhbz#720056 - file conflict python-paste-deploy x django-evolution
    Remove tests from installed RPM

 django-evolution.spec |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/django-evolution.spec b/django-evolution.spec
index 28e016e..f34397e 100644
--- a/django-evolution.spec
+++ b/django-evolution.spec
@@ -1,8 +1,6 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-
 Name:           django-evolution
 Version:        0.6.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Schema evolution for Django
 
 Group:          Development/Languages
@@ -49,9 +47,8 @@ update the database to reflect those changes.
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 
-#Make tests executable
-chmod +x $RPM_BUILD_ROOT/%{python_sitelib}/tests/runtests.py
-chmod +x $RPM_BUILD_ROOT/%{python_sitelib}/tests/run-pyflakes.py
+# Delete tests. They aren't useful in an installed system
+rm -rf $RPM_BUILD_ROOT/%{python_sitelib}/tests
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -61,9 +58,12 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS LICENSE README docs/
 %{python_sitelib}/django_evolution/*
 %{python_sitelib}/django_evolution-%{version}*.egg-info
-%{python_sitelib}/tests/*
 
 %changelog
+* Mon Jul 11 2011 Stephen Gallagher <sgallagh at redhat.com> - 0.6.4-2
+- Resolves: rhbz#720056 - file conflict python-paste-deploy x django-evolution
+- Remove tests from installed RPM
+
 * Thu Jun 23 2011 Stephen Gallagher <sgallagh at redhat.com> - 0.6.4-1
 - New upstream release 0.6.4
 - Unit test compatibility fixes for Django SVN


More information about the scm-commits mailing list