[python-djblets] Fix Django requirement for F18+

Stephen Gallagher sgallagh at fedoraproject.org
Thu Apr 26 00:03:10 UTC 2012


commit 05a98a4a66f5ec69d208e8867d94bf5eef4549e7
Author: Stephen Gallagher <sgallagh at redhat.com>
Date:   Wed Apr 25 20:03:06 2012 -0400

    Fix Django requirement for F18+
    
    - Guarantee rebuild of egg-info

 python-djblets.spec |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)
---
diff --git a/python-djblets.spec b/python-djblets.spec
index 3cdf33d..26993ba 100644
--- a/python-djblets.spec
+++ b/python-djblets.spec
@@ -5,7 +5,7 @@
 
 Name:           python-djblets
 Version:        0.6.17
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A collection of useful classes and functions for Django
 Group:          Applications/Internet
 # Djblets is MIT licensed:
@@ -21,7 +21,11 @@ BuildArch:      noarch
 BuildRequires:  python
 BuildRequires:  python-devel
 BuildRequires:  python-setuptools
+%if 0%{?fedora} > 17
+Requires:       python-django >= 1.1.1
+%else
 Requires:       Django >= 1.1.1
+%endif
 Requires:       python-imaging
 
 Patch1000: FED01-Disable-ez_setup-when-installing-by-RPM.patch
@@ -33,6 +37,9 @@ A collection of useful classes and functions for Django
 %setup -q -n Djblets-%{version}
 %patch1000 -p1
 
+# Remove packaged egg-info so it's regenerated by setup.py
+rm -Rf Djblets*.egg-info
+
 %build
 %{__python} setup.py build
 
@@ -58,6 +65,10 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/djblets/
 
 %changelog
+* Wed Apr 25 2012 Stephen Gallagher <sgallagh at redhat.com> - 0.6.17-2
+- Fix Django requirement for F18+
+- Guarantee rebuild of egg-info
+
 * Wed Apr 25 2012 Stephen Gallagher <sgallagh at redhat.com> - 0.6.17-1
 - New upstream release 0.6.17
 - djblets.gravatars:


More information about the scm-commits mailing list