From 6e2c5633b9ca706f38cc8ed2db0428669bc71041b3b12a9a040efcd9ef9ca8be Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Fri, 18 Jan 2013 08:32:38 +0000 Subject: [PATCH] - Set license to "Apache-2.0 and LGPL-2.1+ and MIT", according to https://github.com/kennethreitz/requests/issues/1111, the base license is Apache-2.0 but requests ships two libraries (bnc#799119): + charade: LGPL-2.1+ + urllib3: MIT - Set license to "Apache-2.0 and LGPL-2.1+ and MIT", according to https://github.com/kennethreitz/requests/issues/1111, the base license is Apache-2.0 but requests ships two libraries (bnc#799119): + charade: LGPL-2.1+ + urllib3: MIT OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-requests?expand=0&rev=30 --- python-requests.changes | 9 +++++++++ python-requests.spec | 4 ++-- python3-requests.changes | 9 +++++++++ python3-requests.spec | 4 ++-- 4 files changed, 22 insertions(+), 4 deletions(-) diff --git a/python-requests.changes b/python-requests.changes index cdeeec6..21d7596 100644 --- a/python-requests.changes +++ b/python-requests.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Jan 18 08:31:22 UTC 2013 - saschpe@suse.de + +- Set license to "Apache-2.0 and LGPL-2.1+ and MIT", according to + https://github.com/kennethreitz/requests/issues/1111, the base + license is Apache-2.0 but requests ships two libraries (bnc#799119): + + charade: LGPL-2.1+ + + urllib3: MIT + ------------------------------------------------------------------- Tue Jan 15 19:37:18 UTC 2013 - p.drouand@gmail.com diff --git a/python-requests.spec b/python-requests.spec index b03e167..14e23b8 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -21,8 +21,9 @@ Version: 1.1.0 Release: 0 Url: http://python-requests.org Summary: Awesome Python HTTP Library That's Actually Usable -License: ISC +License: Apache-2.0 and LGPL-2.1+ and MIT Group: Development/Languages/Python +#TODO/FIXME: Maybe split out charade and urllib3 into sub-packages to simplify: Source: http://pypi.python.org/packages/source/r/requests/requests-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python @@ -64,7 +65,6 @@ Features: # For rpmlint warning: remove shebang from python library: sed -i '/^#!/d' ./requests/certs.py - %build python setup.py build diff --git a/python3-requests.changes b/python3-requests.changes index 675b99f..46cffad 100644 --- a/python3-requests.changes +++ b/python3-requests.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Jan 18 08:33:19 UTC 2013 - saschpe@suse.de + +- Set license to "Apache-2.0 and LGPL-2.1+ and MIT", according to + https://github.com/kennethreitz/requests/issues/1111, the base + license is Apache-2.0 but requests ships two libraries (bnc#799119): + + charade: LGPL-2.1+ + + urllib3: MIT + ------------------------------------------------------------------- Tue Jan 15 19:37:31 UTC 2013 - p.drouand@gmail.com diff --git a/python3-requests.spec b/python3-requests.spec index dd2fae3..bca4729 100644 --- a/python3-requests.spec +++ b/python3-requests.spec @@ -21,8 +21,9 @@ Version: 1.1.0 Release: 0 Url: http://python-requests.org Summary: Awesome Python HTTP Library That's Actually Usable -License: ISC +License: Apache-2.0 and LGPL-2.1+ and MIT Group: Development/Languages/Python +#TODO/FIXME: Maybe split out charade and urllib3 into sub-packages to simplify: Source: http://pypi.python.org/packages/source/r/requests/requests-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python3 @@ -59,7 +60,6 @@ Features: # For rpmlint warning: remove shebang from python library: sed -i '/^#!/d' ./requests/certs.py - %build python3 setup.py build