diff --git a/python-moksha-hub.spec b/python-moksha-hub.spec index e3e6c24..e3e9408 100644 --- a/python-moksha-hub.spec +++ b/python-moksha-hub.spec @@ -2,7 +2,7 @@ Name: python-moksha-hub Version: 1.2.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Hub components for Moksha Group: Development/Libraries @@ -19,24 +19,25 @@ BuildRequires: python-nose BuildRequires: python-mock BuildRequires: python-moksha-common >= 1.0.6 -BuildRequires: python-twisted -BuildRequires: python-qpid +BuildRequires: python-twisted-core BuildRequires: python-stomper BuildRequires: python-txzmq BuildRequires: python-txws BuildRequires: python-daemon -# https://bugzilla.redhat.com/show_bug.cgi?id=909644 -#BuildRequires: python-websocket-client +BuildRequires: python-websocket-client Requires: python-moksha-common >= 1.0.6 -Requires: python-twisted -Requires: python-qpid +Requires: python-twisted-core Requires: python-stomper Requires: python-txzmq Requires: python-txws Requires: python-daemon +# When installed, these enable new plugins for the moksha.hub +#BuildRequires: python-qpid +#Requires: python-qpid + # Its a whole different package now. Conflicts: moksha < 1.0.0 @@ -52,11 +53,6 @@ Hub components for Moksha. # *Experimental* support for python-zmq-13.0.0 in rawhide. %{__sed} -i 's/pyzmq<=2.2.0.1/pyzmq/' setup.py -# Remove websocket client tests for now until this review is complete. -# https://bugzilla.redhat.com/show_bug.cgi?id=909644 -%{__sed} -i "s/'websocket-client',//" setup.py -rm moksha/hub/tests/test_websockets.py* - %build CFLAGS="%{optflags}" %{__python} setup.py build @@ -79,6 +75,10 @@ CFLAGS="%{optflags}" %{__python} setup.py build %{_bindir}/moksha-hub %changelog +* Tue Jan 14 2014 Ralph Bean - 1.2.2-2 +- Enable websocket portion of the test suite again. +- Remove hard dep on python-qpid. + * Fri Dec 13 2013 Ralph Bean - 1.2.2-1 - Latest upstream fixing a memory leak in the websocket server.