Merge branch 'release/2.0.1'

LICENSE

@@ -0,0 +1,26 @@
+License
+=======
+
+MIT license
+
+http://www.opensource.org/licenses/mit-license.php
+
+Copyright (c) 2012 Ralph Bean
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in 
+the Software without restriction, including without limitation the rights to 
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies 
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all 
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 
+SOFTWARE.

MANIFEST.in

@@ -1,2 +1,3 @@
 recursive-include tw2/jqplugins/gritter/static *
 include README.rst
+include LICENSE

python-tw2-jqplugins-gritter.spec

@@ -3,15 +3,14 @@
 %global modname tw2.jqplugins.gritter
 
 Name:           python-tw2-jqplugins-gritter
-Version:        2.0.0
+Version:        2.0.1
 Release:        1%{?dist}
-Summary:        jQuery gritter (growl-like popups) for ToscaWidgets2
+Summary:        jQuery gritter (growl-like pop-ups) for ToscaWidgets2
 
 Group:          Development/Languages
 License:        MIT
 URL:            http://toscawidgets.org
 Source0:        http://pypi.python.org/packages/source/t/%{modname}/%{modname}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
 # For building
@@ -28,28 +27,41 @@ Requires:       python-tw2-jquery
 Requires:       python-tw2-jqplugins-ui
 
 %description
-This module provides growl like popups with the gritter plugin for
+This module provides growl like pop-ups with the gritter plugin for
 python-tw2-jqplugins-ui.
 
 %prep
 %setup -q -n %{modname}-%{version}
 
+%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\"]; import pkg_resources"}1' setup.py > setup.py.tmp
+mv setup.py.tmp setup.py
+
+# Remove all the fancy nosetests configuration for older python
+rm setup.cfg
+
+%endif
+
+
 %build
 %{__python} setup.py build
+# This is a hack to get the jqplugins to not stomp all over each others
+# namespace declarations.
+rm -f build/lib/tw2/jqplugins/__init__.py*
 
 %install
-rm -rf %{buildroot}
 %{__python} setup.py install -O1 --skip-build \
     --install-data=%{_datadir} --root %{buildroot}
 
-%clean
-rm -rf %{buildroot}
-
 %files
-%defattr(-,root,root,-)
-%doc README.rst
+%doc README.rst LICENSE
 %{python_sitelib}/*
 
 %changelog
+* Wed May 02 2012 Ralph Bean <rbean@redhat.com> - 2.0.1-1
+- Upstream release, includes the LICENSE
+
 * Wed Apr 11 2012 Ralph Bean <rbean@redhat.com> - 2.0.0-1
 - Initial packaging for Fedora

setup.py

@@ -11,7 +11,7 @@
 
 setup(
     name='tw2.jqplugins.gritter',
-    version='2.0.0',
+    version='2.0.1',
     description='toscawidgets2 wrapper for jquery gritter plugin.',
     long_description=long_description,
     author='Ralph Bean',

tw2/jqplugins/gritter/__init__.py

@@ -1,6 +1,6 @@
 """ TW2 'cookies' plugins.  Simply provides the js resource for other plugins.
 
-Get the source from http://github.com/ralphbean/tw2.jqplugins.cookies
+Get the source from http://github.com/toscawidgets/tw2.jqplugins.cookies
 """
 
 from base import *