[askbot/el6] Update to 0.7.49
Kevin Fenzi
kevin at fedoraproject.org
Tue Jan 7 22:18:20 UTC 2014
commit 88a569846d0e6bde87cb7b3ff0eb44f026e31629
Author: Kevin Fenzi <kevin at scrye.com>
Date: Tue Jan 7 15:18:21 2014 -0700
Update to 0.7.49
- Fixes bug 1010166
- Many thanks to Anshu Prateek and Eduardo Echeverria
askbot-celery-import.patch | 28 ++++++++++++++++
askbot-django-celery-version.patch | 59 ++++++++++++++++++++++++++++++++++
askbot-remove-celery-mustache.patch | 19 +++++++++++
askbot-remove-celery.patch | 36 +++++++++++++++++++++
askbot-upfile-deploy-path.patch | 25 ++++++++++++++
askbot.spec | 60 ++++++++++++++++++++++++-----------
6 files changed, 208 insertions(+), 19 deletions(-)
---
diff --git a/askbot-celery-import.patch b/askbot-celery-import.patch
new file mode 100644
index 0000000..71794e6
--- /dev/null
+++ b/askbot-celery-import.patch
@@ -0,0 +1,28 @@
+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
+
+---
+ askbot/models/__init__.py | 7 +++++--
+ 1 files changed, 5 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 @@
+ import re
+ import urllib
+ import uuid
+-from celery import states
+-from celery.task import task
++try:
++ from celery import states
++ from celery.task import task
++except ImportError:
++ pass
++
+ from django.core.urlresolvers import reverse, NoReverseMatch
+ from django.db.models import signals as django_signals
+ from django.template import Context
diff --git a/askbot-django-celery-version.patch b/askbot-django-celery-version.patch
new file mode 100644
index 0000000..25ca100
--- /dev/null
+++ b/askbot-django-celery-version.patch
@@ -0,0 +1,59 @@
+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
+
+---
+ askbot/__init__.py | 19 ++++++++-----------
+ 1 files changed, 8 insertions(+), 11 deletions(-)
+
+diff --git a/askbot/__init__.py b/askbot/__init__.py
+index 19c3953f035cbd255276f76eb57a875a23253246..d07fc6a330fe93f9c3e4fc77d60a97eab0d5c088 100644
+--- a/askbot/__init__.py
++++ b/askbot/__init__.py
+@@ -14,34 +14,31 @@ VERSION = (0, 7, 49)
+ REQUIREMENTS = {
+ 'akismet': 'akismet',
+ 'django': 'django>=1.3.1,<=1.5',
+- 'compressor': 'django-compressor==1.2',
++ 'compressor': 'django-compressor',
+ 'jinja2': 'Jinja2',
+ 'coffin': 'Coffin>=0.3',
+ 'south': 'South>=0.7.1',
+ 'oauth2': 'oauth2',
+ 'markdown2': 'markdown2',
+- 'html5lib': 'html5lib==0.90',
++ 'html5lib': 'html5lib>=0.90',
+ 'keyedcache': 'django-keyedcache',
+ 'threaded_multihost': 'django-threaded-multihost',
+ 'robots': 'django-robots',
+- 'sanction': 'sanction==0.3.1',
++ 'sanction': 'sanction',
+ 'unidecode': 'unidecode',
+- 'django_countries': 'django-countries==1.0.5',
+- 'djcelery': 'django-celery==3.0.11',
+- 'djkombu': 'django-kombu==0.9.4',
++ 'django_countries': 'django-countries>=1.0.5',
++ 'djkombu': 'django-kombu',
+ 'followit': 'django-followit',
+ 'recaptcha_works': 'django-recaptcha-works',
+ 'openid': 'python-openid',
+- 'pystache': 'pystache==0.3.1',
++ 'pystache': 'pystache>=0.3.1',
+ 'pytz': 'pytz',
+- 'tinymce': 'django-tinymce==1.5.1b2',
++ 'tinymce': 'django-tinymce',
+ 'longerusername': 'longerusername',
+ 'bs4': 'beautifulsoup4',
+- 'picklefield': 'django-picklefield==0.3.0',
++ 'picklefield': 'django-picklefield',
+ }
+
+-if platform.system() != 'Windows':
+- REQUIREMENTS['lamson'] = 'Lamson'
+
+ #necessary for interoperability of django and coffin
+ try:
+--
+1.7.2.1
+
diff --git a/askbot-remove-celery-mustache.patch b/askbot-remove-celery-mustache.patch
new file mode 100644
index 0000000..98d328f
--- /dev/null
+++ b/askbot-remove-celery-mustache.patch
@@ -0,0 +1,19 @@
+--- a/askbot/setup_templates/settings.py.mustache
++++ b/askbot/setup_templates/settings.py.mustache
+@@ -182,7 +182,6 @@
+ 'keyedcache',
+ 'robots',
+ 'django_countries',
+- 'djcelery',
+ 'djkombu',
+ 'followit',
+ 'tinymce',
+@@ -236,8 +235,6 @@
+ BROKER_TRANSPORT = "djkombu.transport.DatabaseTransport"
+ CELERY_ALWAYS_EAGER = True
+
+-import djcelery
+-djcelery.setup_loader()
+ DOMAIN_NAME = '{{domain_name}}'
+
+ CSRF_COOKIE_NAME = '{{domain_name}}_csrf'
diff --git a/askbot-remove-celery.patch b/askbot-remove-celery.patch
new file mode 100644
index 0000000..708f2e1
--- /dev/null
+++ b/askbot-remove-celery.patch
@@ -0,0 +1,36 @@
+From 7116c462f9fed3dc22ba8a8158bbd2051d76a932 Mon Sep 17 00:00:00 2001
+From: Anshu Prateek <anshprat at fedoraproject.org>
+Date: Fri, 1 Nov 2013 18:09:28 +0000
+Subject: [PATCH 4/4] 004
+
+---
+ askbot/setup_templates/settings.py | 6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/askbot/setup_templates/settings.py b/askbot/setup_templates/settings.py
+index 7a856f6fa6e2d4d166271eb904f8ef28c322de05..1df3490e92e9f015322e3cb94f4a30d0237c1bf0 100644
+--- a/askbot/setup_templates/settings.py
++++ b/askbot/setup_templates/settings.py
+@@ -185,7 +185,7 @@ INSTALLED_APPS = (
+ 'keyedcache',
+ 'robots',
+ 'django_countries',
+- 'djcelery',
++
+ 'djkombu',
+ 'followit',
+ 'tinymce',
+@@ -240,8 +240,8 @@ ASKBOT_USE_STACKEXCHANGE_URLS = False #mimic url scheme of stackexchange
+ BROKER_TRANSPORT = "djkombu.transport.DatabaseTransport"
+ CELERY_ALWAYS_EAGER = True
+
+-import djcelery
+-djcelery.setup_loader()
++
++
+
+ CSRF_COOKIE_NAME = 'askbot_csrf'
+ #enter domain name here - e.g. example.com
+--
+1.7.2.1
+
diff --git a/askbot-upfile-deploy-path.patch b/askbot-upfile-deploy-path.patch
new file mode 100644
index 0000000..1a9e33e
--- /dev/null
+++ b/askbot-upfile-deploy-path.patch
@@ -0,0 +1,25 @@
+From 2a4797c7fe41706d1bdcbeca4084e8cc2b85dfa4 Mon Sep 17 00:00:00 2001
+From: anshu <anshu at aerospike.com>
+Date: Mon, 14 Oct 2013 22:53:41 +0530
+Subject: [PATCH] removing upfiles from individual sites folder
+
+---
+ askbot/deployment/path_utils.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/askbot/deployment/path_utils.py b/askbot/deployment/path_utils.py
+index 1229cf1bde3ef7d844f7ee7b37e6a4ec6c9154ba..f0dde1c04e266f2a30be95996b2843bceb101429 100644
+--- a/askbot/deployment/path_utils.py
++++ b/askbot/deployment/path_utils.py
+@@ -211,7 +211,7 @@ def deploy_into(directory, new_project = False, verbosity = 1, context = None):
+ print ''
+ app_dir = os.path.join(directory, 'askbot')
+
+- copy_dirs = ('doc', 'cron', 'upfiles')
++ copy_dirs = ('doc', 'cron')
+ dirs_copied = 0
+ for dir_name in copy_dirs:
+ src = os.path.join(SOURCE_DIR, dir_name)
+--
+1.8.3.1
+
diff --git a/askbot.spec b/askbot.spec
index a160c66..30d7728 100644
--- a/askbot.spec
+++ b/askbot.spec
@@ -1,6 +1,6 @@
Name: askbot
-Version: 0.7.48
-Release: 8%{?dist}
+Version: 0.7.49
+Release: 1%{?dist}
Summary: Question and Answer forum
Group: Applications/Publishing
License: GPLv3+
@@ -13,6 +13,11 @@ Source4: README.fedora
Patch0: askbot-remove-test-skins.patch
Patch1: askbot-pystache-templatespec.patch
+Patch2: askbot-django-celery-version.patch
+Patch3: askbot-upfile-deploy-path.patch
+Patch4: askbot-celery-import.patch
+Patch5: askbot-remove-celery.patch
+Patch6: askbot-remove-celery-mustache.patch
BuildArch: noarch
BuildRequires: python-setuptools python-devel gettext
@@ -29,11 +34,10 @@ Requires: django-recaptcha-works
Requires: django-picklefield
Requires: django-extra-form-fields
Requires: django-authenticator
-Requires: django-celery
Requires: django-followit
Requires: django-avatar
%else
-Requires: python-django
+Requires: python-django14
Requires: python-django-south
Requires: python-django-keyedcache
Requires: python-django-robots
@@ -44,13 +48,14 @@ Requires: python-django-recaptcha-works
Requires: python-django-picklefield
Requires: python-django-extra-form-fields
Requires: python-django-authenticator
-Requires: python-django-celery
Requires: python-django-followit
Requires: python-django-avatar
%endif
Requires: python-django-tinymce
Requires: python-django-longerusername
+Requires: python-django-compressor
+Requires: python-dateutil
Requires: python-billiard
Requires: python-html5lib
@@ -71,23 +76,20 @@ Requires: tinymce
Requires: python-beautifulsoup4
Requires: pytz
Requires: python-sanction
-Requires: python-lamson
+Requires: python-chardet
+Requires: python-nose
+Requires: python-daemon
+#Requires: python-lamson
# Database backend -- Not required; we used sqlite out of the box
#Requires: MySQL-python
-#Requires: python-psycopg2
+Requires: python-psycopg2
# for building the doc
Requires: python-sphinx
Requires: httpd
-%if 0%{?rhel}
-Requires: python-dateutil15
-%else
-Requires: python-dateutil
-%endif
-
# For setting selinux context in %%post
Requires: policycoreutils-python
@@ -113,6 +115,12 @@ Features:
%patch1 -p1 -b .stache
%endif
+%patch2 -p1 -b .initpy
+%patch3 -p1 -b .pathpy
+%patch4 -p1 -b .modelinitpy
+%patch5 -p1 -b .set
+%patch6 -p1 -b .setmustache
+
# remove empty files
rm -rf %{name}/doc/build/html/.buildinfo
rm -rf %{name}/db
@@ -188,6 +196,8 @@ chcon -R -t httpd_sys_rw_content_t %{_localstatedir}/cache/%{name}/
## Symlink the default skin into the skins directory
#ln -s %{python_sitelib}/%{name}/static/default \
# %{python_sitelib}/%{name}/skins/default
+#ln -s %{python_sitelib}/%{name}/static/admin \
+# %{python_sitelib}/%{name}/skins/admin
# Set perm mask for httpd
chown -R apache:apache %{_localstatedir}/log/%{name}/
@@ -235,24 +245,36 @@ chown -R apache:apache %{_localstatedir}/cache/%{name}/
%{python_sitelib}/%{name}/deps/*.py*
%{python_sitelib}/%{name}/deps/README
%{python_sitelib}/%{name}/deps/django_authopenid/
-%dir %{python_sitelib}/%{name}/deps/livesettings/
-%dir %{python_sitelib}/%{name}/deps/livesettings/locale/
-%{python_sitelib}/%{name}/deps/livesettings/*.py*
-%{python_sitelib}/%{name}/deps/livesettings/README
-%{python_sitelib}/%{name}/deps/livesettings/temp*
+%{python_sitelib}/%{name}/deps/livesettings/
+%{python_sitelib}/%{name}/deps/group_messaging/
%{python_sitelib}/%{name}/importers/
%{python_sitelib}/%{name}/middleware/
%{python_sitelib}/%{name}/migrations_api/
%{python_sitelib}/%{name}/patches/
%{python_sitelib}/%{name}/search/
%{python_sitelib}/%{name}/user_messages/
-%{python_sitelib}/%{name}/deps
%{python_sitelib}/%{name}/mail
%{python_sitelib}/%{name}/media
%{python_sitelib}/%{name}/templates
%{python_sitelib}/askbot*.egg-info
+%{python_sitelib}/custom_settings/
+
%changelog
+* Tue Jan 07 2014 Kevin Fenzi <kevin at scrye.com> 0.7.49-1
+- Update to 0.7.49
+- Fixes bug 1010166
+- Many thanks to Anshu Prateek and Eduardo Echeverria
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.48-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Mon Jun 10 2013 Rahul Sundaram <sundaram at fedoraproject.org> - 0.7.48-10
+- Drop python-lamson for now since it has become non-free. c.f. rhbz#972251
+
+* Fri May 03 2013 Rahul Sundaram <sundaram at fedoraproject.org> 0.7.48-9
+- Change Requires from python-django to python-django14. Resolves rhbz#950413
+
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.40-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
More information about the scm-commits
mailing list