[askbot/el6] bump to upstream 0.7.51 and rebase patches
Pete Travis
immanetize at fedoraproject.org
Sun Feb 15 05:10:46 UTC 2015
commit 4ad387b6b15d46d4f6a25b1942e14efb2b4a0873
Author: Pete Travis <immanetize at fedoraproject.org>
Date: Mon Feb 9 20:25:37 2015 -0700
bump to upstream 0.7.51 and rebase patches
askbot-celery-import.patch | 25 ++++++++++++++-----------
askbot-django-celery-version.patch | 31 +++++++++++++++++--------------
askbot.spec | 14 +++++++++-----
3 files changed, 40 insertions(+), 30 deletions(-)
---
diff --git a/askbot-celery-import.patch b/askbot-celery-import.patch
index 71794e6..4514cfc 100644
--- a/askbot-celery-import.patch
+++ b/askbot-celery-import.patch
@@ -1,17 +1,17 @@
-From a45b5f2bdfd2ce98ca3df9d81714a4f4c2f9c2b5 Mon Sep 17 00:00:00 2001
-From: Anshu Prateek <anshprat at fedoraproject.org>
-Date: Fri, 1 Nov 2013 09:05:54 +0000
-Subject: [PATCH 2/2] Fedora build patch-2
+From 6b87056635545a5b5f161b85e604d46143bf2730 Mon Sep 17 00:00:00 2001
+From: Pete Travis <immanetize at fedoraproject.org>
+Date: Sat, 7 Feb 2015 15:36:27 -0700
+Subject: [PATCH 3/3] only try to import celery
---
- askbot/models/__init__.py | 7 +++++--
- 1 files changed, 5 insertions(+), 2 deletions(-)
+ askbot/models/__init__.py | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/askbot/models/__init__.py b/askbot/models/__init__.py
-index a2f55ab7f92d4f089f23e3368e028324eb06aa9d..b94bc14308b26bd87d0d7e3f71c4b8212a1bf1ce 100644
---- a/askbot/models/__init__.py
-+++ b/askbot/models/__init__.py
-@@ -16,8 +16,12 @@
+index 1d3e06e..b6ce921 100644
+--- a/askbot/models/__init__.py
++++ b/askbot/models/__init__.py
+@@ -16,8 +16,12 @@ import logging
import re
import urllib
import uuid
@@ -24,5 +24,8 @@ index a2f55ab7f92d4f089f23e3368e028324eb06aa9d..b94bc14308b26bd87d0d7e3f71c4b821
+ pass
+
from django.core.urlresolvers import reverse, NoReverseMatch
+ from django.core.paginator import Paginator
from django.db.models import signals as django_signals
- from django.template import Context
+--
+2.3.0
+
diff --git a/askbot-django-celery-version.patch b/askbot-django-celery-version.patch
index 25ca100..9503453 100644
--- a/askbot-django-celery-version.patch
+++ b/askbot-django-celery-version.patch
@@ -1,20 +1,20 @@
-From 17888870fbd37a7110b96b6403a67ed2f2c9a8a6 Mon Sep 17 00:00:00 2001
-From: Anshu Prateek <anshprat at fedoraproject.org>
-Date: Fri, 1 Nov 2013 09:04:11 +0000
-Subject: [PATCH 1/2] Fedora build patch-1
+From 15632fe27d0c86fcea7ce3931a1878b35d7baf80 Mon Sep 17 00:00:00 2001
+From: Pete Travis <immanetize at fedoraproject.org>
+Date: Sat, 7 Feb 2015 15:31:22 -0700
+Subject: [PATCH 2/2] adapt requires for el6
---
- askbot/__init__.py | 19 ++++++++-----------
- 1 files changed, 8 insertions(+), 11 deletions(-)
+ askbot/__init__.py | 23 +++++++++--------------
+ 1 file changed, 9 insertions(+), 14 deletions(-)
diff --git a/askbot/__init__.py b/askbot/__init__.py
-index 19c3953f035cbd255276f76eb57a875a23253246..d07fc6a330fe93f9c3e4fc77d60a97eab0d5c088 100644
+index 94b2172..bee01c9 100644
--- a/askbot/__init__.py
+++ b/askbot/__init__.py
-@@ -14,34 +14,31 @@ VERSION = (0, 7, 49)
+@@ -14,36 +14,31 @@ VERSION = (0, 7, 51)
REQUIREMENTS = {
'akismet': 'akismet',
- 'django': 'django>=1.3.1,<=1.5',
+ 'django': 'django>=1.3.1,<1.6',
- 'compressor': 'django-compressor==1.2',
+ 'compressor': 'django-compressor',
'jinja2': 'Jinja2',
@@ -31,7 +31,7 @@ index 19c3953f035cbd255276f76eb57a875a23253246..d07fc6a330fe93f9c3e4fc77d60a97ea
+ 'sanction': 'sanction',
'unidecode': 'unidecode',
- 'django_countries': 'django-countries==1.0.5',
-- 'djcelery': 'django-celery==3.0.11',
+- 'djcelery': 'django-celery>=3.0.11',
- 'djkombu': 'django-kombu==0.9.4',
+ 'django_countries': 'django-countries>=1.0.5',
+ 'djkombu': 'django-kombu',
@@ -39,21 +39,24 @@ index 19c3953f035cbd255276f76eb57a875a23253246..d07fc6a330fe93f9c3e4fc77d60a97ea
'recaptcha_works': 'django-recaptcha-works',
'openid': 'python-openid',
- 'pystache': 'pystache==0.3.1',
-+ 'pystache': 'pystache>=0.3.1',
- 'pytz': 'pytz',
+- 'pytz': 'pytz==2013b',
- 'tinymce': 'django-tinymce==1.5.1b2',
++ 'pystache': 'pystache>=0.3.1',
++ 'pytz': 'pytz',
+ 'tinymce': 'django-tinymce',
'longerusername': 'longerusername',
'bs4': 'beautifulsoup4',
- 'picklefield': 'django-picklefield==0.3.0',
+- #'stopforumspam': 'stopforumspam'
+ 'picklefield': 'django-picklefield',
}
-if platform.system() != 'Windows':
- REQUIREMENTS['lamson'] = 'Lamson'
-
+-
#necessary for interoperability of django and coffin
try:
+ from askbot import patches
--
-1.7.2.1
+2.3.0
diff --git a/askbot.spec b/askbot.spec
index 30d7728..f08d1f9 100644
--- a/askbot.spec
+++ b/askbot.spec
@@ -1,11 +1,11 @@
Name: askbot
-Version: 0.7.49
+Version: 0.7.51
Release: 1%{?dist}
Summary: Question and Answer forum
Group: Applications/Publishing
License: GPLv3+
URL: http://askbot.org
-Source0: http://pypi.python.org/packages/source/a/%{name}/%{name}-%{version}.tar.gz
+Source0: https://github.com/%{name}/%{name}-devel/archive/%{version}.tar.gz
Source1: askbot.wsgi
Source2: askbot-settings.py
Source3: askbot-httpd.conf
@@ -106,7 +106,7 @@ Features:
* can import data from stack-exchange database file
%prep
-%setup -q
+%setup -q -n %{name}-devel-%{version}
%patch0 -p1 -b .skins
%if 0%{?rhel}
@@ -211,7 +211,7 @@ chown -R apache:apache %{_localstatedir}/cache/%{name}/
#rm -rf %{python_sitelib}/askbot/locale
%files -f %{name}.lang
-%doc PKG-INFO LICENSE COPYING AUTHORS README.rst README.fedora
+%doc LICENSE COPYING AUTHORS README.rst README.fedora
%{_bindir}/askbot-setup
%{_sbindir}/askbot.wsgi
@@ -257,10 +257,14 @@ chown -R apache:apache %{_localstatedir}/cache/%{name}/
%{python_sitelib}/%{name}/media
%{python_sitelib}/%{name}/templates
%{python_sitelib}/askbot*.egg-info
-%{python_sitelib}/custom_settings/
+%ghost %attr(755, root,root) %{python_sitelib}/custom_settings/
%changelog
+* Sat Feb 07 2015 Pete Travis <me at petetravis.com> - 0.7.51
+- Update to upstream 0.7.51
+- Rebase patches to new version
+
* Tue Jan 07 2014 Kevin Fenzi <kevin at scrye.com> 0.7.49-1
- Update to 0.7.49
- Fixes bug 1010166
More information about the scm-commits
mailing list