Permalink
Browse files

Merge branch 'release/2.0.3'

  • Loading branch information...
2 parents 0b604e8 + 4cd1528 commit f42801115c77fa56db69d5350c3ace9fede9e91f @ralphbean ralphbean committed May 2, 2012
Showing with 76 additions and 12 deletions.
  1. +23 −0 LICENSE-jit.txt
  2. +23 −0 LICENSE-tw2-jit.txt
  3. +3 −1 MANIFEST.in
  4. +19 −8 python-tw2-jit.spec
  5. +8 −3 setup.py
View
@@ -0,0 +1,23 @@
+/*
+Copyright (c) 2012 Sencha Inc. - Author: Nicolas Garcia Belmonte (http://philogb.github.com/)
+
+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
@@ -0,0 +1,23 @@
+/*
+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.
+
+ */
+
View
@@ -1,4 +1,6 @@
+include LICENSE-jit.txt
+include LICENSE-tw2-jit.txt
include README.rst
recursive-include tw2/jit/templates *
recursive-include tw2/jit/static *
-recursive-include tests *
+recursive-include tests *.py
View
@@ -3,15 +3,14 @@
%global modname tw2.jit
Name: python-tw2-jit
-Version: 2.0.2
+Version: 2.0.3
Release: 1%{?dist}
Summary: Javascript Infovis Toolkit (JIT) 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
@@ -51,22 +50,34 @@ thejit data visualizations.
%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
+
+%endif
+
+
%build
%{__python} setup.py build
%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-tw2-jit.txt LICENSE-jit.txt
%{python_sitelib}/*
%changelog
+* Wed May 02 2012 Ralph Bean <rbean@redhat.com> - 2.0.3-1
+- New upstream release just to include LICENSE files.
+
+* Wed May 02 2012 Ralph Bean <rbean@redhat.com> - 2.0.2-2
+- Removed clean section
+- Removed defattr in files section
+- Removed unnecessary references to buildroot
+
* Thu Apr 12 2012 Ralph Bean <rbean@redhat.com> - 2.0.2-1
- Initial packaging for Fedora
View
@@ -1,4 +1,4 @@
-from setuptools import setup, find_packages
+from setuptools import setup
f = open('README.rst')
long_description = f.read().strip()
@@ -7,7 +7,7 @@
setup(
name='tw2.jit',
- version='2.0.2',
+ version='2.0.3',
description='toscawidgets2 wrapper for the javascript infovis toolkit(jit)',
long_description=long_description,
author='Ralph Bean',
@@ -23,7 +23,12 @@
"sqlalchemy",
"BeautifulSoup",
],
- packages=find_packages(exclude=['ez_setup']),
+ packages=[
+ 'tw2',
+ 'tw2.jit',
+ 'tw2.jit.samples',
+ 'tw2.jit.widgets',
+ ],
namespace_packages = ['tw2'],
zip_safe=False,
include_package_data=True,

0 comments on commit f428011

Please sign in to comment.