Permalink
Browse files

Merge branch 'release/2.0.2'

  • Loading branch information...
2 parents 1b83b38 + 4750522 commit 8bb87549169ab464f422707780113a3f3882fd6b @ralphbean ralphbean committed Sep 13, 2012
Showing with 10 additions and 3 deletions.
  1. +7 −2 python-tw2-jqplugins-gritter.spec
  2. +1 −1 setup.py
  3. +2 −0 tw2/jqplugins/gritter/base.py
@@ -4,7 +4,7 @@
Name: python-tw2-jqplugins-gritter
Version: 2.0.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: jQuery gritter (growl-like pop-ups) for ToscaWidgets2
Group: Development/Languages
@@ -57,9 +57,14 @@ rm -f build/lib/tw2/jqplugins/__init__.py*
%files
%doc README.rst LICENSE
-%{python_sitelib}/*
+
+%{python_sitelib}/tw2/jqplugins/gritter
+%{python_sitelib}/%{modname}-%{version}-*
%changelog
+* Mon May 07 2012 Ralph Bean <rbean@redhat.com> - 2.0.1-2
+- Updated directory ownership to avoid conflict with other tw2 packages.
+
* Wed May 02 2012 Ralph Bean <rbean@redhat.com> - 2.0.1-1
- Upstream release, includes the LICENSE
View
@@ -11,7 +11,7 @@
setup(
name='tw2.jqplugins.gritter',
- version='2.0.1',
+ version='2.0.2',
description='toscawidgets2 wrapper for jquery gritter plugin.',
long_description=long_description,
author='Ralph Bean',
@@ -1,12 +1,14 @@
# TW2 proper imports
import tw2.core as twc
+import tw2.jquery as twj
import simplejson
jquery_gritter_js = twc.JSLink(
modname='tw2.jqplugins.gritter',
filename='static/jquery/gritter/js/jquery.gritter.min.js'
+ resources=[twj.jquery_js]
)
jquery_gritter_css = twc.CSSLink(
modname='tw2.jqplugins.gritter',

0 comments on commit 8bb8754

Please sign in to comment.