rpms/python-weberror/devel python-weberror.spec,1.4,1.5

[Toshio くらとみ]

Author: toshio

Update of /cvs/pkgs/rpms/python-weberror/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv4304

Modified Files:
	python-weberror.spec 
Log Message:

* Sat Jun 26 2010 Toshio Kuratomi <toshio at fedoraproject.org> - 0.10.2-1
- Update to 0.10.2
- Fix license tag



Index: python-weberror.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-weberror/devel/python-weberror.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- python-weberror.spec	27 Jul 2009 01:28:46 -0000	1.4
+++ python-weberror.spec	26 Jun 2010 09:29:31 -0000	1.5
@@ -1,18 +1,27 @@
+%if 0%{?fedora} < 13 || 0%{?rhel} < 6
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%endif
 
 Name:           python-weberror
-Version:        0.10.1
-Release:        4%{?dist}
+Version:        0.10.2
+Release:        1%{?dist}
 Summary:        Web Error handling and exception catching middleware
 
 Group:          Development/Languages
-License:        MIT
+# JQuery and its javascript plugins are licensed MIT or GPLv2
+# weberror/collector.py has portions copyrighted as ZPLv2.0
+# Everything else is licensed MIT
+License:        MIT and ZPLv2.0 and (MIT or GPLv2)
 URL:            http://pypi.python.org/pypi/WebError
 Source0:        http://pypi.python.org/packages/source/W/WebError/WebError-%{version}.tar.gz
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:      noarch
 
+%if 0%{?fedora} < 13
 BuildRequires:  python-setuptools-devel
+%else
+BuildRequires:  python-setuptools
+%endif
 BuildRequires:  python-nose
 BuildRequires:  python-webob
 BuildRequires:  python-webtest
@@ -56,11 +65,15 @@ nosetests
 %files
 %defattr(-,root,root,-)
 %doc CHANGELOG LICENSE
-%{python_sitelib}/weberror
+%{python_sitelib}/weberror/
 %{python_sitelib}/*.egg-info
 
 
 %changelog
+* Sat Jun 26 2010 Toshio Kuratomi <toshio at fedoraproject.org> - 0.10.2-1
+- Update to 0.10.2
+- Fix license tag
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild