[moksha] Bumping to version 0.7.1-2.
Ralph Bean
ralph at fedoraproject.org
Mon May 14 14:56:12 UTC 2012
commit e43a2808a38d7a14327034fa8add97175f6d370e
Author: Ralph Bean <rbean at redhat.com>
Date: Mon May 14 10:56:02 2012 -0400
Bumping to version 0.7.1-2.
.gitignore | 1 +
moksha.spec | 125 ++++++++++++++++++++++++++++++++++++++++++++++++-----------
sources | 2 +-
3 files changed, 104 insertions(+), 24 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4f69d6f..76c27da 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/moksha-0.5.0.tar.bz2
+/moksha-0.7.1.tar.gz
diff --git a/moksha.spec b/moksha.spec
index ed47540..a3628b5 100644
--- a/moksha.spec
+++ b/moksha.spec
@@ -2,18 +2,26 @@
%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
Name: moksha
-Version: 0.5.0
-Release: 7%{?dist}
+Version: 0.7.1
+Release: 2%{?dist}
Summary: A platform for creating real-time web applications
Group: Applications/Internet
-License: AGPLv3
+License: ASL 2.0
URL: https://fedorahosted.org/moksha
-Source0: https://fedorahosted.org/releases/m/o/%{name}/%{name}-%{version}.tar.bz2
+Source0: http://pypi.python.org/packages/source/m/%{name}/%{name}-%{version}.tar.gz
+
+# The upstream source used to be here:
+#Source0: https://fedorahosted.org/releases/m/o/%{name}/%{name}-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: python-setuptools
+%if %{?rhel}%{!?rhel:0} >= 6
+BuildRequires: python-webob1.0 >= 0.9.7
+%else
+BuildRequires: python-webob >= 0.9.7
+%endif
BuildRequires: pytz
BuildRequires: python-setuptools-devel
BuildRequires: python-devel
@@ -22,36 +30,81 @@ BuildRequires: python-paver
BuildRequires: python-sphinx
BuildRequires: python-paste
BuildRequires: python-nose
+BuildRequires: python-coverage
BuildRequires: python-BeautifulSoup
BuildRequires: python-stomper
-BuildRequires: python-tw-forms
-BuildRequires: python-tw-jquery
+BuildRequires: python-kitchen
+BuildRequires: python-psutil
+BuildRequires: python-fabulous
+BuildRequires: python-tw2-core
+BuildRequires: python-tw2-forms
+BuildRequires: python-tw2-jquery
+BuildRequires: python-tw2-jqplugins-ui
+BuildRequires: python-tw2-jqplugins-flot
+BuildRequires: python-tw2-jqplugins-gritter
+BuildRequires: python-tw2-excanvas
+BuildRequires: python-tw2-jit
+BuildRequires: python-twisted-core
+BuildRequires: python-txzmq
+BuildRequires: python-txws
BuildRequires: python-feedparser
BuildRequires: python-feedcache
BuildRequires: python-repoze-what-quickstart
BuildRequires: python-shove
BuildRequires: python-bunch
BuildRequires: TurboGears2
-BuildRequires: orbited
+BuildRequires: python-daemon
+BuildRequires: pyOpenSSL
+BuildRequires: python-babel
+BuildRequires: orbited
+BuildRequires: python-repoze-who-testutil
+BuildRequires: python-amqplib
+
+%if 0%{?el5}
+BuildRequires: python-sqlite2
+BuildRequires: python-hashlib
+Requires: python-sqlite2
+Requires: python-hashlib
+%endif
+
+%if %{?rhel}%{!?rhel:0} >= 6
+Requires: python-webob1.0 >= 0.9.7
+%else
+Requires: python-webob >= 0.9.7
+%endif
Requires: TurboGears2
-Requires: python-toscawidgets >= 0.9.1
Requires: python-zope-sqlalchemy
Requires: python-shove
Requires: python-feedcache
Requires: python-feedparser
-Requires: python-tw-jquery >= 0.9.4.1
-Requires: orbited
Requires: python-sphinx
Requires: python-paver
-Requires: python-tw-forms
Requires: python-morbid
Requires: pytz
Requires: python-repoze-who-testutil
Requires: python-BeautifulSoup
-Requires: python-twisted
+Requires: python-twisted-core
+Requires: python-zmq
+Requires: python-txzmq
+Requires: python-txws
Requires: python-stomper
Requires: python-daemon
+Requires: python-kitchen
+Requires: python-psutil
+Requires: python-fabulous
+Requires: python-tw2-core
+Requires: python-tw2-forms
+Requires: python-tw2-jquery
+Requires: python-tw2-jqplugins-ui
+Requires: python-tw2-jqplugins-flot
+Requires: python-tw2-jqplugins-gritter
+Requires: python-tw2-excanvas
+Requires: python-tw2-jit
+
+Requires: pyOpenSSL
+Requires: python-babel
+
%description
Moksha is a platform for creating real-time collaborative web applications. It
@@ -74,6 +127,7 @@ Summary: mod_wsgi Moksha server
Group: Applications/Internet
Requires: %{name} = %{version}-%{release}
Requires: mod_wsgi httpd
+Requires: orbited
%description server
This package contains an Apache mod_wsgi configuration for Moksha.
@@ -81,12 +135,24 @@ This package contains an Apache mod_wsgi configuration for Moksha.
%prep
%setup -q
+%if %{?rhel}%{!?rhel:0} >= 6
+
+# Make sure that epel/rhel picks up the correct version of webob
+%{__awk} 'NR==1{print "import __main__; __main__.__requires__ = __requires__ = [\"WebOb>=1.0\", \"sqlalchemy>=0.6\"]; import pkg_resources"}1' setup.py > setup.py.tmp
+%{__mv} setup.py.tmp setup.py
+
+%endif
+
+
%build
%{__python} setup.py build
%{__sed} -i -e 's/$VERSION/%{version}/g' docs/conf.py
make -C docs html
-%{__rm} docs/_build/html/.buildinfo
+#%{__rm} docs/_build/html/.buildinfo
+
+# Remove twisted from the list of dependencies in setup.py.
+%{__sed} -i 's/"Twisted",//' setup.py
%install
%{__rm} -rf %{buildroot}
@@ -126,14 +192,19 @@ make -C docs html
%{__rm} %{buildroot}%{_datadir}/%{name}/production/moksha-hub.init
-%check
-PYTHONPATH=$(pwd) python setup.py test
-# Remove the tests
-%{__rm} -r %{buildroot}%{python_sitelib}/%{name}/tests
+# Check section removed until a RHEL6 bug with python-repoze-what-plugins-sql
+# can be fixed. It causes a fatal error in the test suite.
+# https://bugzilla.redhat.com/show_bug.cgi?id=813925
-# Remove the demo after its tests pass
-%{__rm} -r %{buildroot}%{python_sitelib}/%{name}/apps/demo
+###%check
+###PYTHONPATH=$(pwd) python setup.py test
+###
+#### Remove the tests
+###%{__rm} -r %{buildroot}%{python_sitelib}/%{name}/tests
+###
+#### Remove the demo after its tests pass
+####%{__rm} -r %{buildroot}%{python_sitelib}/%{name}/apps/demo
%post
@@ -185,11 +256,19 @@ fi
%doc docs/_build/html
%changelog
-* Thu Apr 26 2012 Luke Macken <lmacken at redhat.com> - 0.5.0-8
-- Remove our requirement on pyevent, which was orphaned
+* Mon May 14 2012 Ralph Bean <rbean at redhat.com> - 0.7.1-2
+- Commented check section out. Tests fail due to a RHEL bug with repoze.
+
+* Sat Apr 14 2012 Ralph Bean <rbean at redhat.com> - 0.7.1-1
+- New version with zeromq and tw2.
+
+* Thu Feb 09 2012 Luke Macken <lmacken at redhat.com> - 0.6.0-2
+- Remove the pyevent requirement
-* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.0-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+* Fri Aug 19 2011 Luke Macken <lmacken at redhat.com> - 0.6.0-1
+- 0.6.0 release
+- Update our dependencies to finally get the test suite running
+- Improve how we run our unit tests, to get them working on RHEL5
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/sources b/sources
index 0ac563a..967f538 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7be9dcf7ccce7b8fd66d7a6c4fa66fd4 moksha-0.5.0.tar.bz2
+8072c9ad0db795448df75343f917eea5 moksha-0.7.1.tar.gz
More information about the scm-commits
mailing list