up to 0.7.8

diff --git a/python-djblets.spec b/python-djblets.spec
index f314271d80c4cd1af109f07d8b76aac938d1a4c6..98644656dff9440a6dc48249ddf7deaf5f2a0cab 100644 (file)
--- a/python-djblets.spec
+++ b/python-djblets.spec
@@ -1,25 +1,31 @@
+# TODO
+# - use system jquery, jquery-ui
 Summary:       A collection of useful classes and functions for Django
 Name:          python-djblets
-Version:       0.6.7
+Version:       0.7.8
 Release:       1
 Group:         Applications/Networking
 # Djblets is MIT licensed:
 # http://code.google.com/p/reviewboard/wiki/Djblets
-# Jquery is bundled in Djblets. Jquery is dual-licensed MIT or GPLv2, hence
+# jQuery is bundled in Djblets. Jquery is dual-licensed MIT or GPLv2, hence
 # the package license is "MIT and (MIT or GPLv2)":
 # https://www.redhat.com/archives/fedora-legal-list/2009-May/msg00025.html
 License:       MIT and (MIT or GPL v2)
 URL:           http://www.review-board.org/
-Source0:       http://downloads.review-board.org/releases/Djblets/0.6/Djblets-%{version}.tar.gz
-# Source0-md5: 0c5fb9556442bcf928a0609e54c9203d
+Source0:       http://downloads.review-board.org/releases/Djblets/0.7/Djblets-%{version}.tar.gz
+# Source0-md5: 9540b0d25ba632c38cc3e3a41e659564
 BuildRequires: python
 BuildRequires: python-devel
+BuildRequires: python-django-pipeline >= 1.2.16
 BuildRequires: python-modules
 BuildRequires: python-setuptools
 BuildRequires: rpm-pythonprov
 BuildRequires: sed >= 4.0
 Requires:      python-PIL
-Requires:      python-django >= 1.1.1
+Requires:      python-django >= 1.4.2
+Requires:      python-django-pipeline >= 1.2.16
+Requires:      python-feedparser >= 5.1.2
+Requires:      python-pytz
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -28,8 +34,9 @@ A collection of useful classes and functions for Django
 
 %prep
 %setup -q -n Djblets-%{version}
-%{__sed} -i -e 's/^from ez_setup/#from ez_setup/' setup.py
-%{__sed} -i -e 's/^use_setuptools()/#use_setuptools()/' setup.py
+
+# Remove packaged egg-info so it's regenerated by setup.py
+%{__rm} -r Djblets*.egg-info
 
 %build
 %{__python} setup.py build
@@ -42,9 +49,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %py_postclean
 
-# Remove the "tests" subdirectory to avoid it polluting the main python
-# namespace:
-rm -rf $RPM_BUILD_ROOT%{py_sitescriptdir}/tests
+# Remove bundled copy of feedparser.py
+#%{__rm} $RPM_BUILD_ROOT%{py_sitescriptdir}/djblets/feedview/feedparser.py*
+
+# Remove the "tests" subdirectory to avoid it polluting the main python namespace:
+%{__rm} -r $RPM_BUILD_ROOT%{py_sitescriptdir}/tests
 
 %clean
 rm -rf $RPM_BUILD_ROOT