From 72c279cf59d91e66ee8c359a58743149027113f7 Mon Sep 17 00:00:00 2001 From: Konstantin Ryabitsev Date: Dec 06 2006 00:23:50 +0000 Subject: - Upstream 0.6c3 - Use cvs to track licenses --- diff --git a/.cvsignore b/.cvsignore index ea76af1..555d56c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1 @@ -setuptools-0.6c2.zip -zpl.txt -psfl.txt +setuptools-0.6c3.tar.gz diff --git a/psfl.txt b/psfl.txt new file mode 100644 index 0000000..e3cb43e --- /dev/null +++ b/psfl.txt @@ -0,0 +1,216 @@ +Python Software Foundation License +Python 2.1.1 license + +This is the official license for the Python 2.1.1 release: +A. HISTORY OF THE SOFTWARE +========================== + +Python was created in the early 1990s by Guido van Rossum at Stichting +Mathematisch Centrum (CWI) in the Netherlands as a successor of a language +called ABC. Guido is Python's principal author, although it includes many +contributions from others. The last version released from CWI was Python 1.2. +In 1995, Guido continued his work on Python at the Corporation for National +Research Initiatives (CNRI) in Reston, Virginia where he released several +versions of the software. Python 1.6 was the last of the versions released by +CNRI. In 2000, Guido and the Python core development team moved to BeOpen.com +to form the BeOpen PythonLabs team. Python 2.0 was the first and only release +from BeOpen.com. + +Following the release of Python 1.6, and after Guido van Rossum left CNRI to +work with commercial software developers, it became clear that the ability to +use Python with software available under the GNU Public License (GPL) was very +desirable. CNRI and the Free Software Foundation (FSF) interacted to develop +enabling wording changes to the Python license. Python 1.6.1 is essentially the +same as Python 1.6, with a few minor bug fixes, and with a different license +that enables later versions to be GPL-compatible. Python 2.1 is a derivative +work of Python 1.6.1, as well as of Python 2.0. + +After Python 2.0 was released by BeOpen.com, Guido van Rossum and the other +PythonLabs developers joined Digital Creations. All intellectual property added +from this point on, starting with Python 2.1 and its alpha and beta releases, +is owned by the Python Software Foundation (PSF), a non-profit modeled after +the Apache Software Foundation. See http://www.python.org/psf/ for more +information about the PSF. + +Thanks to the many outside volunteers who have worked under Guido's direction +to make these releases possible. + +B. TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING PYTHON +=============================================================== + +PSF LICENSE AGREEMENT +--------------------- + +1. This LICENSE AGREEMENT is between the Python Software Foundation ("PSF"), +and the Individual or Organization ("Licensee") accessing and otherwise using +Python 2.1.1 software 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 2.1.1 alone or in any derivative version, +provided, however, that PSF's License Agreement and PSF's notice of copyright, +i.e., "Copyright (c) 2001 Python Software Foundation; All Rights Reserved" are +retained in Python 2.1.1 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 2.1.1 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 2.1.1. + +4. PSF is making Python 2.1.1 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 2.1.1 WILL NOT INFRINGE ANY THIRD PARTY RIGHTS. + +5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON 2.1.1 FOR +ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS A RESULT OF +MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 2.1.1, 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 2.1.1, Licensee agrees to +be bound by the terms and conditions of this License Agreement. + +BEOPEN.COM TERMS AND CONDITIONS FOR PYTHON 2.0 +---------------------------------------------- + +BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1 + +1. This LICENSE AGREEMENT is between BeOpen.com ("BeOpen"), having an office at +160 Saratoga Avenue, Santa Clara, CA 95051, and the Individual or Organization +("Licensee") accessing and otherwise using this software in source or binary +form and its associated documentation ("the Software"). + +2. Subject to the terms and conditions of this BeOpen Python License Agreement, +BeOpen hereby grants Licensee a non-exclusive, royalty-free, world-wide license +to reproduce, analyze, test, perform and/or display publicly, prepare +derivative works, distribute, and otherwise use the Software alone or in any +derivative version, provided, however, that the BeOpen Python License is +retained in the Software, alone or in any derivative version prepared by +Licensee. + +3. BeOpen is making the Software available to Licensee on an "AS IS" basis. +BEOPEN MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY WAY OF +EXAMPLE, BUT NOT LIMITATION, BEOPEN MAKES NO AND DISCLAIMS ANY REPRESENTATION +OR WARRANTY OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT +THE USE OF THE SOFTWARE WILL NOT INFRINGE ANY THIRD PARTY RIGHTS. + +4. BEOPEN SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE SOFTWARE +FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS A RESULT OF +USING, MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY DERIVATIVE THEREOF, EVEN +IF ADVISED OF THE POSSIBILITY THEREOF. + +5. This License Agreement will automatically terminate upon a material breach +of its terms and conditions. + +6. This License Agreement shall be governed by and interpreted in all respects +by the law of the State of California, excluding conflict of law provisions. +Nothing in this License Agreement shall be deemed to create any relationship of +agency, partnership, or joint venture between BeOpen and Licensee. This License +Agreement does not grant permission to use BeOpen trademarks or trade names in +a trademark sense to endorse or promote products or services of Licensee, or +any third party. As an exception, the "BeOpen Python" logos available at +http://www.pythonlabs.com/logos.html may be used according to the permissions +granted on that web page. + +7. By copying, installing or otherwise using the software, Licensee agrees to +be bound by the terms and conditions of this License Agreement. + +CNRI OPEN SOURCE GPL-COMPATIBLE LICENSE AGREEMENT +------------------------------------------------- + +1. This LICENSE AGREEMENT is between the Corporation for National Research +Initiatives, having an office at 1895 Preston White Drive, Reston, VA 20191 +("CNRI"), and the Individual or Organization ("Licensee") accessing and +otherwise using Python 1.6.1 software in source or binary form and its +associated documentation. + +2. Subject to the terms and conditions of this License Agreement, CNRI 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 1.6.1 alone or in any derivative version, +provided, however, that CNRI's License Agreement and CNRI's notice of +copyright, i.e., "Copyright (c) 1995-2001 Corporation for National Research +Initiatives; All Rights Reserved" are retained in Python 1.6.1 alone or in any +derivative version prepared by Licensee. Alternately, in lieu of CNRI's License +Agreement, Licensee may substitute the following text (omitting the quotes): +"Python 1.6.1 is made available subject to the terms and conditions in CNRI's +License Agreement. This Agreement together with Python 1.6.1 may be located on +the Internet using the following unique, persistent identifier (known as a +handle): 1895.22/1013. This Agreement may also be obtained from a proxy server +on the Internet using the following URL: http://hdl.handle.net/1895.22/1013". + +3. In the event Licensee prepares a derivative work that is based on or +incorporates Python 1.6.1 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 1.6.1. + +4. CNRI is making Python 1.6.1 available to Licensee on an "AS IS" basis. CNRI +MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY WAY OF EXAMPLE, +BUT NOT LIMITATION, CNRI MAKES NO AND DISCLAIMS ANY REPRESENTATION OR WARRANTY +OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF +PYTHON 1.6.1 WILL NOT INFRINGE ANY THIRD PARTY RIGHTS. + +5. CNRI SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON 1.6.1 FOR +ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS A RESULT OF +MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 1.6.1, 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. This License Agreement shall be governed by the federal intellectual +property law of the United States, including without limitation the federal +copyright law, and, to the extent such U.S. federal law does not apply, by the +law of the Commonwealth of Virginia, excluding Virginia's conflict of law +provisions. Notwithstanding the foregoing, with regard to derivative works +based on Python 1.6.1 that incorporate non-separable material that was +previously distributed under the GNU General Public License (GPL), the law of +the Commonwealth of Virginia shall govern this License Agreement only as to +issues arising under or with respect to Paragraphs 4, 5, and 7 of this License +Agreement. Nothing in this License Agreement shall be deemed to create any +relationship of agency, partnership, or joint venture between CNRI and +Licensee. This License Agreement does not grant permission to use CNRI +trademarks or trade name in a trademark sense to endorse or promote products or +services of Licensee, or any third party. + +8. By clicking on the "ACCEPT" button where indicated, or by copying, +installing or otherwise using Python 1.6.1, Licensee agrees to be bound by the +terms and conditions of this License Agreement. + + ACCEPT + +CWI PERMISSIONS STATEMENT AND DISCLAIMER +---------------------------------------- + +Copyright (c) 1991 - 1995, Stichting Mathematisch Centrum Amsterdam, The +Netherlands. All rights reserved. + +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that +the above copyright notice appear in all copies and that both that copyright +notice and this permission notice appear in supporting documentation, and that +the name of Stichting Mathematisch Centrum or CWI not be used in advertising or +publicity pertaining to distribution of the software without specific, written +prior permission. + +STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS +SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN +NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM BE LIABLE FOR ANY SPECIAL, +INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS +OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF +THIS SOFTWARE. + diff --git a/python-setuptools.spec b/python-setuptools.spec index 2e35516..f8ba3fc 100644 --- a/python-setuptools.spec +++ b/python-setuptools.spec @@ -1,14 +1,14 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-setuptools -Version: 0.6c2 +Version: 0.6c3 Release: 1%{?dist} Summary: Download, build, install, upgrade, and uninstall Python packages Group: Development/Languages License: PSFL/ZPL URL: http://peak.telecommunity.com/DevCenter/setuptools -Source0: http://cheeseshop.python.org/packages/source/s/setuptools/setuptools-%{version}.zip +Source0: http://cheeseshop.python.org/packages/source/s/setuptools/setuptools-%{version}.tar.gz Source1: psfl.txt Source2: zpl.txt BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -24,6 +24,7 @@ have dependencies on other packages. %prep %setup -q -n setuptools-%{version} +chmod -x *.txt find -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python}|' @@ -38,6 +39,8 @@ rm -rf $RPM_BUILD_ROOT --single-version-externally-managed install -p -m 0644 %{SOURCE1} %{SOURCE2} . find $RPM_BUILD_ROOT%{python_sitelib} -name '*.exe' | xargs rm -f +find $RPM_BUILD_ROOT%{python_sitelib} -name '*.txt' | xargs chmod -x +chmod +x $RPM_BUILD_ROOT%{python_sitelib}/setuptools/command/easy_install.py %clean @@ -52,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Dec 05 2006 Konstantin Ryabitsev - 0.6c3-1 +- Upstream 0.6c3 (#218540, thanks to Michel Alexandre Salim for the patch) + * Tue Sep 12 2006 Konstantin Ryabitsev - 0.6c2-1 - Upstream 0.6c2 - Ghostbusting diff --git a/sources b/sources index e3637a3..e9f00cf 100644 --- a/sources +++ b/sources @@ -1,3 +1 @@ -b0729008542f44d07c510d880ba582aa setuptools-0.6c2.zip -0f810c1ec4c50e3e0fe390d14a831d48 zpl.txt -85f03c95710162ed140bc8fa22790b2a psfl.txt +76cb98b779d356c64323125490f88d17 setuptools-0.6c3.tar.gz diff --git a/zpl.txt b/zpl.txt new file mode 100644 index 0000000..44e0648 --- /dev/null +++ b/zpl.txt @@ -0,0 +1,59 @@ +Zope Public License (ZPL) Version 2.0 +----------------------------------------------- + +This software is Copyright (c) Zope Corporation (tm) and +Contributors. All rights reserved. + +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 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 Zope Corporation (tm) must not be used to + endorse or promote products derived from this software + without prior written permission from Zope Corporation. + +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 Zope Corporation. Use of them is + covered in a separate agreement (see + http://www.zope.com/Marks). + +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 ZOPE CORPORATION ``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 ZOPE CORPORATION OR ITS CONTRIBUTORS 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. + + +This software consists of contributions made by Zope +Corporation and many individuals on behalf of Zope +Corporation. Specific attributions are listed in the +accompanying credits file.