Commits

Ralph Bean  committed 38ec492 Merge

Merge branch 'release/2.0.3'

  • Participants
  • Parent commits 56fa202, abaf440

Comments (0)

Files changed (5)

File LICENSE-jit.txt

+/*
+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.
+
+ */
+ 

File LICENSE-tw2-jit.txt

+/*
+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.
+
+ */
+ 
+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

File python-tw2-jit.spec

 %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
 
 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
 %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
-from setuptools import setup, find_packages
+from setuptools import setup
 
 f = open('README.rst')
 long_description = f.read().strip()
 
 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',
         "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,