Browse files

Merge branch 'release/0.2.5' into develop

  • Loading branch information...
2 parents 13504f3 + 558490b commit 27da50af89127f1d88ef60d3af52e5db683766ed @ralphbean committed Jul 18, 2012
Showing with 23 additions and 4 deletions.
  1. +1 −0 .gitignore
  2. +14 −3 busmon.spec
  3. +8 −1 setup.py
View
1 .gitignore
@@ -11,3 +11,4 @@ doc/build
README.pdf
*.pid
*.log
+make-release.sh
View
17 busmon.spec
@@ -4,8 +4,8 @@
%define modname busmon
Name: busmon
-Version: 0.2.4
-Release: 3%{?dist}
+Version: 0.2.5
+Release: 4%{?dist}
Summary: A webapp for visualizing the Fedora Message Bus
License: LGPLv2
@@ -107,11 +107,22 @@ rm -fr %{buildroot}%{python_sitelib}/migration
%files
%doc README.rst
-%{_datadir}/%{name}/
%{python_sitelib}/%{modname}/
%{python_sitelib}/%{modname}-%{version}*
+%{_datadir}/%{name}/
+# Just for verification's sake.
+%{_datadir}/%{name}/public/toscawidgets/resources/moksha.widgets.moksha_js/static/moksha.js
+%{_datadir}/%{name}/public/toscawidgets/resources/tw2.jqplugins.gritter/static/jquery/gritter/js/jquery.gritter.min.js
+
%changelog
+* Wed Jul 18 2012 Ralph Bean <rbean@redhat.com> - 0.2.5-4
+- Bugfix to archiving moksha resources.
+
+* Wed Jul 18 2012 Ralph Bean <rbean@redhat.com> - 0.2.5-1
+- Compat with older TurboGears for production
+- Archiving moksha resources as well as busmon
+
* Wed Jul 18 2012 Ralph Bean <rbean@redhat.com> - 0.2.4-1
- Ripped out busmon.model and sqlalchemy deps. Unnecessary.
- Removed dep on moksha-server.
View
9 setup.py
@@ -46,7 +46,7 @@
setup(
name='busmon',
- version='0.2.4',
+ version='0.2.5',
description='A webapp for visualizing activity on the Fedora Message Bus.',
author='Ralph Bean',
author_email='rbean@redhat.com',
@@ -83,6 +83,13 @@
'messages_series = busmon.widgets:MessagesTimeSeries',
'colorized_msgs = busmon.widgets:ColorizedMessagesWidget',
),
+ 'tw2.widgets': (
+ # FIXME -- this is a hack until the following is resolved
+ # https://fedorahosted.org/moksha/ticket/247
+ "moksha_js = moksha.widgets.moksha_js",
+ # FIXME -- I dunno whats up with this one
+ "gritter_js = tw2.jqplugins.gritter.base",
+ ),
},
dependency_links=[
"http://www.turbogears.org/2.1/downloads/current/"

0 comments on commit 27da50a

Please sign in to comment.