[python-djblets] Generate requires.txt with values appropriate for Fedora
Stephen Gallagher
sgallagh at fedoraproject.org
Sat Feb 22 01:12:50 UTC 2014
commit 98f8ae5467c4c8a4801a5849a0674bbcc6c942ea
Author: Stephen Gallagher <sgallagh at redhat.com>
Date: Fri Feb 21 20:11:33 2014 -0500
Generate requires.txt with values appropriate for Fedora
FED01-Fix-dependencies.patch | 30 ++++++++++++++++++++++++++++++
python-djblets.spec | 10 +++++++++-
2 files changed, 39 insertions(+), 1 deletions(-)
---
diff --git a/FED01-Fix-dependencies.patch b/FED01-Fix-dependencies.patch
new file mode 100644
index 0000000..6e34654
--- /dev/null
+++ b/FED01-Fix-dependencies.patch
@@ -0,0 +1,30 @@
+From e2832abdff43c4a96cf404b242ecbee82f8cf984 Mon Sep 17 00:00:00 2001
+From: Stephen Gallagher <sgallagh at redhat.com>
+Date: Fri, 21 Feb 2014 20:09:27 -0500
+Subject: [PATCH] FEDORA: Fix dependencies
+
+---
+ setup.py | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index a99c3057f9b02931a3357b3ab0cfc3a8ca933157..2660856f90f8ec7769779dfe5abe79bc6d52e135 100755
+--- a/setup.py
++++ b/setup.py
+@@ -98,10 +98,10 @@ setup(name=PACKAGE_NAME,
+ packages=find_packages(exclude=["tests"]),
+ cmdclass=cmdclasses,
+ install_requires=[
+- 'Django>=1.4.8,<1.5',
+- 'django-pipeline==1.2.24',
++ 'Django>=1.4,<1.5',
++ 'django-pipeline<1.3',
+ 'feedparser>=5.1.2',
+- 'PIL',
++ 'pillow',
+ 'pytz',
+ ],
+ dependency_links = [
+--
+1.8.5.3
+
diff --git a/python-djblets.spec b/python-djblets.spec
index 344818d..0d036d5 100644
--- a/python-djblets.spec
+++ b/python-djblets.spec
@@ -5,7 +5,7 @@
Name: python-djblets
Version: 0.7.28
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A collection of useful classes and functions for Django
Group: Applications/Internet
# Djblets is MIT licensed:
@@ -34,12 +34,17 @@ Conflicts: python-django-pipeline >= 1.3.0
BuildRequires: python-django14
Requires: python-django14
+# Fedora-specific patches
+Patch1001: FED01-Fix-dependencies.patch
+
%description
A collection of useful classes and functions for Django
%prep
%setup -q -n Djblets-%{version}
+%patch1001 -p1
+
# Remove packaged egg-info so it's regenerated by setup.py
rm -Rf Djblets*.egg-info
@@ -69,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT
%{python_sitelib}/djblets/
%changelog
+* Fri Feb 21 2014 Stephen Gallagher <sgallagh at redhat.com> 0.7.28-2
+- Generate requires.txt with values appropriate for Fedora
+
* Thu Jan 02 2014 Stephen Gallagher <sgallagh at redhat.com> - 0.7.28-1
- New upstream release 0.7.28
- http://downloads.reviewboard.org/releases/Djblets/0.7/Djblets-0.7.28.NEWS
More information about the scm-commits
mailing list