Permalink
Browse files

Merge branch 'release/2.0.1' into develop

  • Loading branch information...
2 parents 2ee0385 + 2091a42 commit 8e090c30d86ae60f330cb309dc9a898c6b81211a @ralphbean ralphbean committed May 2, 2012
Showing with 26 additions and 4 deletions.
  1. +18 −0 LICENSE
  2. +1 −0 MANIFEST.in
  3. +6 −3 python-tw2-excanvas.spec
  4. +1 −1 setup.py
View
18 LICENSE
@@ -0,0 +1,18 @@
+Copyright (c) 2011-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.
View
1 MANIFEST.in
@@ -1,3 +1,4 @@
+include LICENSE
include README.rst
recursive-include tw2/excanvas/static *
recursive-include tests *.py
View
9 python-tw2-excanvas.spec
@@ -3,8 +3,8 @@
%global modname tw2.excanvas
Name: python-tw2-excanvas
-Version: 2.0.0
-Release: 2%{?dist}
+Version: 2.0.1
+Release: 1%{?dist}
Summary: Excanvas for ToscaWidgets2
Group: Development/Languages
@@ -43,10 +43,13 @@ Simple excanvas resource wrapper for ToscaWidgets2.
PYTHONPATH=$(pwd) python setup.py test
%files
-%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 proper LICENSE file.
+
* Mon Apr 30 2012 Ralph Bean <rbean@redhat.com> - 2.0.0-2
- Removed clean section
- Removed defattr in files section
View
2 setup.py
@@ -7,7 +7,7 @@
setup(
name='tw2.excanvas',
- version='2.0.0',
+ version='2.0.1',
description='toscawidgets2 wrapper for excanvas.js resource',
long_description='',
author='Ralph Bean',

0 comments on commit 8e090c3

Please sign in to comment.