Permalink
Browse files

Merge branch 'release/2.0.1' into develop

  • Loading branch information...
2 parents 4c13a67 + a415c95 commit 2d524b9fa1e2afe3c607e76623112bd47461fb6d @ralphbean ralphbean committed May 2, 2012
Showing with 32 additions and 4 deletions.
  1. +23 −0 LICENSE
  2. +1 −0 MANIFEST.in
  3. +6 −3 python-tw2-sqla.spec
  4. +2 −1 setup.py
View
@@ -0,0 +1,23 @@
+/*
+Copyright (c) 2012 Paul Johnston & Contributors
+
+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
@@ -2,3 +2,4 @@ recursive-include tw2/sqla/templates *
recursive-include tw2/sqla/static *
recursive-include tests *.py
include README.rst
+include LICENSE
@@ -3,8 +3,8 @@
%global modname tw2.sqla
Name: python-tw2-sqla
-Version: 2.0.0
-Release: 2%{?dist}
+Version: 2.0.1
+Release: 1%{?dist}
Summary: SQLAlchemy database layer for ToscaWidgets2
Group: Development/Languages
@@ -84,10 +84,13 @@ PYTHONPATH=$(pwd) python setup.py test
%endif
%files
-%doc README.rst
+%doc README.rst LICENSE
%{python_sitelib}/*
%changelog
+* Wed May 02 2012 Ralph Bean <rbean@redhat.com> - 2.0.1-1
+- New upstream release, contains LICENSE.
+
* Wed May 02 2012 Ralph Bean <rbean@redhat.com> - 2.0.0-2
- Removed clean section
- Removed defattr in files section
View
@@ -14,12 +14,13 @@
setup(
name='tw2.sqla',
- version='2.0.0',
+ version='2.0.1',
description='SQLAlchemy database layer for ToscaWidgets 2',
long_description=open('README.rst').read().split('.. split here', 1)[1],
author='Paul Johnston',
author_email='paj@pajhome.org.uk',
url='http://github.com/toscawidgets/tw2.sqla',
+ license='MIT',
install_requires=[
"tw2.forms>=2.0b4",
"tw2.dynforms",

0 comments on commit 2d524b9

Please sign in to comment.