diff --git a/Chameleon-3.6.1.tar.gz b/Chameleon-3.6.1.tar.gz new file mode 100644 index 0000000..1564d6a --- /dev/null +++ b/Chameleon-3.6.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:850f74f756bcb99423dd2658b99f448b09f09ccc2c60c0a2d6dec52294d7f9ed +size 121359 diff --git a/Chameleon-3.6.tar.gz b/Chameleon-3.6.tar.gz deleted file mode 100644 index 4d1a652..0000000 --- a/Chameleon-3.6.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e57407b39814df20e4ba45aafdaf3b10ae7aef25c250f7f9387894d2b99b8104 -size 118658 diff --git a/LICENSE.txt b/LICENSE.txt deleted file mode 100644 index f1980bc..0000000 --- a/LICENSE.txt +++ /dev/null @@ -1,185 +0,0 @@ -The majority of the code in Chameleon is supplied under this license: - - A copyright notice accompanies this license document that identifies - the copyright holders. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are - met: - - 1. Redistributions in source code must retain the accompanying - copyright notice, this list of conditions, and the following - disclaimer. - - 2. Redistributions in binary form must reproduce the accompanying - copyright notice, this list of conditions, and the following - disclaimer in the documentation and/or other materials provided - with the distribution. - - 3. Names of the copyright holders must not be used to endorse or - promote products derived from this software without prior - written permission from the copyright holders. - - 4. If any files are modified, you must cause the modified files to - carry prominent notices stating that you changed the files and - the date of any change. - - Disclaimer - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND - ANY EXPRESSED 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 - HOLDERS BE LIABLE 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 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - SUCH DAMAGE. - -Portions of the code in Chameleon are supplied under the ZPL (headers -within individiual files indicate that these portions are licensed -under the ZPL): - - Zope Public License (ZPL) Version 2.1 - ------------------------------------- - - A copyright notice accompanies this license document that - identifies the copyright holders. - - This license has been certified as open source. It has also - been designated as GPL compatible by the Free Software - Foundation (FSF). - - Redistribution and use in source and binary forms, with or - without modification, are permitted provided that the - following conditions are met: - - 1. Redistributions in source code must retain the - accompanying copyright notice, this list of conditions, - and the following disclaimer. - - 2. Redistributions in binary form must reproduce the accompanying - copyright notice, this list of conditions, and the - following disclaimer in the documentation and/or other - materials provided with the distribution. - - 3. Names of the copyright holders must not be used to - endorse or promote products derived from this software - without prior written permission from the copyright - holders. - - 4. The right to distribute this software or to use it for - any purpose does not give you the right to use - Servicemarks (sm) or Trademarks (tm) of the copyright - holders. Use of them is covered by separate agreement - with the copyright holders. - - 5. If any files are modified, you must cause the modified - files to carry prominent notices stating that you changed - the files and the date of any change. - - Disclaimer - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' - AND ANY EXPRESSED 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 HOLDERS BE - LIABLE 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 OF THIS - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - DAMAGE. - -Portions of the code in Chameleon are supplied under the BSD license -(headers within individiual files indicate that these portions are -licensed under this license): - - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - 2. 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. - 3. The name of the author may not be used to endorse or promote - products derived from this software without specific prior - written permission. - - THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR BE LIABLE 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 OF THIS SOFTWARE, EVEN - IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - -Portions of the code in Chameleon are supplied under the Python -License (headers within individiual files indicate that these portions -are licensed under this license): - - PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2 - -------------------------------------------- - - 1. This LICENSE AGREEMENT is between the Python Software Foundation - ("PSF"), and the Individual or Organization ("Licensee") accessing and - otherwise using this software ("Python") in source or binary form and - its associated documentation. - - 2. Subject to the terms and conditions of this License Agreement, PSF - hereby grants Licensee a nonexclusive, royalty-free, world-wide - license to reproduce, analyze, test, perform and/or display publicly, - prepare derivative works, distribute, and otherwise use Python - alone or in any derivative version, provided, however, that PSF's - License Agreement and PSF's notice of copyright, i.e., "Copyright (c) - 2001, 2002, 2003, 2004 Python Software Foundation; All Rights Reserved" - are retained in Python alone or in any derivative version prepared - by Licensee. - - 3. In the event Licensee prepares a derivative work that is based on - or incorporates Python or any part thereof, and wants to make - the derivative work available to others as provided herein, then - Licensee hereby agrees to include in any such work a brief summary of - the changes made to Python. - - 4. PSF is making Python available to Licensee on an "AS IS" - basis. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR - IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND - DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS - FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT - INFRINGE ANY THIRD PARTY RIGHTS. - - 5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON - FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS - A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON, - OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. - - 6. This License Agreement will automatically terminate upon a material - breach of its terms and conditions. - - 7. Nothing in this License Agreement shall be deemed to create any - relationship of agency, partnership, or joint venture between PSF and - Licensee. This License Agreement does not grant permission to use PSF - trademarks or trade name in a trademark sense to endorse or promote - products or services of Licensee, or any third party. - - 8. By copying, installing or otherwise using Python, Licensee - agrees to be bound by the terms and conditions of this License - Agreement. diff --git a/python-Chameleon.changes b/python-Chameleon.changes index e5f238d..c0f5502 100644 --- a/python-Chameleon.changes +++ b/python-Chameleon.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Apr 1 12:59:13 UTC 2019 - Tomáš Chvátal + +- Update to 3.6.1: + * Fix limited search expression for illegal double hyphens in HTML comments to fix issue #289. + ------------------------------------------------------------------- Thu Mar 7 11:10:27 UTC 2019 - Tomáš Chvátal diff --git a/python-Chameleon.spec b/python-Chameleon.spec index 3429916..5e89ea6 100644 --- a/python-Chameleon.spec +++ b/python-Chameleon.spec @@ -18,15 +18,13 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-Chameleon -Version: 3.6 +Version: 3.6.1 Release: 0 Summary: Fast HTML/XML Template Compiler License: BSD-3-Clause AND BSD-4-Clause AND Python-2.0 AND ZPL-2.1 Group: Development/Languages/Python URL: https://github.com/malthe/chameleon Source: https://files.pythonhosted.org/packages/source/C/Chameleon/Chameleon-%{version}.tar.gz -# https://github.com/malthe/chameleon/pull/288 -Source1: https://raw.githubusercontent.com/malthe/chameleon/master/LICENSE.txt BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros @@ -43,7 +41,6 @@ version of Python (2.5 and up, including 3.x and pypy). %prep %setup -q -n Chameleon-%{version} -cp %{SOURCE1} . %build %python_build @@ -51,7 +48,7 @@ cp %{SOURCE1} . %install %python_install # Don't ship testsuite -%python_expand rm -rvf %{buildroot}%{$python_sitelib}/chameleon/tests +%python_expand rm -r %{buildroot}%{$python_sitelib}/chameleon/tests %python_expand %fdupes %{buildroot}%{$python_sitelib} %check