diff --git a/python-coreapi.changes b/python-coreapi.changes index 0e68129..d3da1dd 100644 --- a/python-coreapi.changes +++ b/python-coreapi.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Feb 27 14:47:25 UTC 2019 - Tomáš Chvátal + +- Use same license string everywhere: + * same-bsd.patch + ------------------------------------------------------------------- Mon Feb 25 12:43:17 UTC 2019 - Tomáš Chvátal diff --git a/python-coreapi.spec b/python-coreapi.spec index 7db3ec1..e5157d8 100644 --- a/python-coreapi.spec +++ b/python-coreapi.spec @@ -26,6 +26,7 @@ Group: Development/Languages/Python URL: https://github.com/core-api/python-client Source: https://github.com/core-api/python-client/archive/%{version}.tar.gz#/coreapi-%{version}.tar.gz Source1: https://raw.githubusercontent.com/core-api/python-client/master/LICENSE.md +Patch0: same-bsd.patch BuildRequires: %{python_module coreschema} BuildRequires: %{python_module itypes} BuildRequires: %{python_module pytest} @@ -48,6 +49,7 @@ for representing Web APIs. %prep %setup -q -n python-client-%{version} cp %{SOURCE1} . +%patch0 -p1 %build %python_build diff --git a/same-bsd.patch b/same-bsd.patch new file mode 100644 index 0000000..95e3036 --- /dev/null +++ b/same-bsd.patch @@ -0,0 +1,94 @@ +From 4b50d5688c4c3de937bfce53ebf156ddda19f5a8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= +Date: Wed, 27 Feb 2019 15:45:25 +0100 +Subject: [PATCH] Make sure we mention the same license everywhere. Issue #177 + +--- + README.md | 21 +++++++++++++-------- + docs/index.md | 21 +++++++++++++-------- + 2 files changed, 26 insertions(+), 16 deletions(-) + +diff --git a/README.md b/README.md +index 249b288..0fdb086 100644 +--- a/README.md ++++ b/README.md +@@ -58,24 +58,29 @@ Other media | `*/*` | Returns a temporary download file. + + ## License + +-Copyright © 2015-2016, Tom Christie. ++Copyright © 2017-present, Tom Christie. + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + +-Redistributions of source code must retain the above copyright notice, this +-list of conditions and the following disclaimer. +-Redistributions in binary form must reproduce the above copyright notice, this +-list of conditions and the following disclaimer in the documentation and/or +-other materials provided with the distribution. ++* Redistributions of source code must retain the above copyright notice, this ++ list of conditions and the following disclaimer. ++ ++* Redistributions in binary form must reproduce the above copyright notice, ++ this list of conditions and the following disclaimer in the documentation ++ and/or other materials provided with the distribution. ++ ++* Neither the name of the copyright holder nor the names of its ++ contributors may be used to endorse or promote products derived from ++ this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR ++FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL ++DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +diff --git a/docs/index.md b/docs/index.md +index 51886bb..71bf269 100644 +--- a/docs/index.md ++++ b/docs/index.md +@@ -58,24 +58,29 @@ Other media | `*/*` | Returns a temporary download file. + + ## License + +-Copyright © 2015-2017, Tom Christie. ++Copyright © 2017-present, Tom Christie. + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + +-Redistributions of source code must retain the above copyright notice, this +-list of conditions and the following disclaimer. +-Redistributions in binary form must reproduce the above copyright notice, this +-list of conditions and the following disclaimer in the documentation and/or +-other materials provided with the distribution. ++* Redistributions of source code must retain the above copyright notice, this ++ list of conditions and the following disclaimer. ++ ++* Redistributions in binary form must reproduce the above copyright notice, ++ this list of conditions and the following disclaimer in the documentation ++ and/or other materials provided with the distribution. ++ ++* Neither the name of the copyright holder nor the names of its ++ contributors may be used to endorse or promote products derived from ++ this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR ++FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL ++DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE