From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Date: Sun, 18 Mar 2007 13:28:59 +0300 From: Alexey Tourbin To: devel@lists.altlinux.org Message-ID: <20070318102859.GS6039@solemn.turbinal> Mail-Followup-To: devel@lists.altlinux.org Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="oyi3v9V9xafcEDI/" Content-Disposition: inline Subject: [devel] python 2.4.4-alt8 X-BeenThere: devel@lists.altlinux.org X-Mailman-Version: 2.1.9rc1 Precedence: list Reply-To: ALT Devel discussion list List-Id: ALT Devel discussion list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Mar 2007 10:32:28 -0000 Archived-At: List-Archive: List-Post: --oyi3v9V9xafcEDI/ Content-Type: text/plain; charset=koi8-r Content-Disposition: inline Content-Transfer-Encoding: quoted-printable =F1 =D0=CF=C4=C7=CF=D4=CF=D7=C9=CC =CE=CF=D7=D5=C0 =D3=C2=CF=D2=CB=D5 =D0= =C9=D4=CF=CE=C1. =F0=D2=C5=C4=CC=C1=C7=C1=C0 =CB=CF=CD=D5-=CE=C9=C2=D5=C4= =D8 =C9=DA @python =D0=D2=CF=D7=C5=D2=C9=D4=D8, =D0=CF=D3=D4=C1=D7=C9=D4=D8/=D0=CF=C4=D0=C9=D3= =C1=D4=D8 =D4=C1=C7 =C9 =CF=D4=D0=D2=C1=D7=C9=D4=D8 =CE=C1 =D3=C2=CF=D2=CB= =D5. 2.4.4-alt8 =20 - this release prepares python-base to be part of base build system - /usr/bin/python is now provided by python-base; no file-level conflict is induced, and python-strict/relaxed logic must still work - removed extra python dependencies from python-base; python-base is now self-contained - moved time.so, re.py, and string.py from python-modules to python-base, so that python-base provides most common dependencies - also moved parser.so, token.py, and symbol.py from python-modules-com= piler to python-base, to satisfy rpm-build-python dependencies - in %%post scripts, replaced absolute symbolic links with relative ones =F7=C9=D6=D5 =D4=CF=CC=D8=CB=CF =CF=C4=CE=D5 =D0=D2=CF=C2=CC=C5=CD=D5: =D0= =CF=D3=CC=C5 =D5=D3=D4=C1=CE=CF=D7=CB=C9 =C9 =D5=C4=C1=CC=C5=CE=C9=D1 pytho= n-relaxed =D3=C9=CD=CC=C9=CE=CB /usr/bin/python =C9=D3=DE=C5=DA=CE=C5=D4. =EE=CF apt= =D3=C1=CD =D0=CF =D3=C5=C2=C5 =CE=C9=CB=CF=C7=C4=C1 =CE=C5 =D3=D4=C1=D7=C9= =D4 python-relaxed; =C1 =D4=CF=D4, =CB=D4=CF =C5=C7=CF =D3=D4=C1=D7=C9=D4, =C4= =CF=CC=D6=CE=CF =C2=D9=D4=D8, =DA=CE=C1=C5=D4, =DE=D4=CF =C4=C5=CC=C1=C5=D4. =EB=D2=CF=CD=C5 =D4=CF=C7=CF, =D4=C1=CD =CE=C5 =D3=CF=D7=D3=C5=CD =CF=C2=D9= =DE=CE=C1=D1 =CC=CF=C7=C9=CB=C1 =D0=CF=D3=D4=C1=CE=CF=D7=CB=C9 =C9 =D5=C4= =C1=CC=C5=CE=C9=D1 =D3=C9=CD=CC=C9=CE=CB=CF=D7, =D4=C1=CB =DE=D4=CF =D7 =D0=D2=C9=CE=C3=C9=D0= =C5 =D3 =D3=C9=CD=CC=C9=CE=CB=CF=CD /usr/bin/python =D7=CF=DA=CD=CF=D6=CE=D9 =C9 =C4=D2=D5=C7=C9=C5 =D0=D2=CF=C2=CC=C5=CD=D9. =EE=C1 =D7=D3=D1=CB=C9=CA =D3=CC=D5=DE=C1=CA =D0=D2=C9=CC=C1=C7=C1=C0 (=D0= =CF=DE=D4=C9) =D0=CF=CC=CE=D9=CA diff (=D4=C1=CD =C2=D9=CC merge). $ git-diff --find-copies-harder --diff-filter=3DCMR origin.. diff --git a/modules-list/base-list b/modules-list/base-list index 7b64bb1..e69adaa 100644 --- a/modules-list/base-list +++ b/modules-list/base-list @@ -2,11 +2,18 @@ UserDict.py codecs.py copy_reg.py lib-dynload/readline.so +lib-dynload/time.so linecache.py os.py posixpath.py +re.py +sre*.py site.py stat.py +string.py types.py warnings.py __future__.py +lib-dynload/parser.so +token.py +symbol.py diff --git a/modules-list/modules-compiler-list b/modules-list/modules-comp= iler-list index 6145a28..f53a357 100644 --- a/modules-list/modules-compiler-list +++ b/modules-list/modules-compiler-list @@ -4,10 +4,7 @@ compileall.py dis.py inspect.py keyword.py -lib-dynload/parser.so new.py opcode.py py_compile.py -symbol.py -token.py tokenize.py diff --git a/python24.spec b/python.spec similarity index 96% rename from python24.spec rename to python.spec index 7eafd65..6d2d9dd 100644 --- a/python24.spec +++ b/python.spec @@ -5,7 +5,7 @@ Name: %real_name =20 Version: 2.4.4 -Release: alt7 +Release: alt8 =20 %define package_name %real_name %define weight 1001 @@ -44,12 +44,16 @@ Patch10: python-2.4-alt-webbrowser.patch # non-standard /usr/doc dehack Patch11: python-2.4.4-alt-sharedoc.patch =20 +# XXX ignore pydoc dependencies for now +%add_findreq_skiplist %_bindir/pydoc* + Requires: %real_name =3D %require_ver PreReq: alternatives >=3D 0.0.6 =20 -BuildPreReq: rpm >=3D 4.0.4-alt36.d8 rpm-build-python >=3D 0.18 -# Automatically added by buildreq on Wed Jan 10 2007 (-bi) -BuildRequires: bzlib-devel emacs-common gcc-c++ libdb4-devel libgdbm-devel= libncurses-devel libreadline-devel libssl-devel tk-devel zlib-devel +BuildPreReq: rpm >=3D 4.0.4-alt36.d8, rpm-build-python >=3D 0.29-alt3 +BuildPreReq: emacs-nox +# Automatically added by buildreq on Sun Dec 31 2006 +BuildRequires: bzlib-devel gcc-c++ libdb4-devel libgdbm-devel libncurses-d= evel libreadline-devel libssl-devel tk-devel zlib-devel =20 %description Python is an interpreted, interactive, object-oriented programming @@ -78,7 +82,6 @@ Conflicts: python22 Conflicts: python =3D 2.2 Conflicts: python23 Conflicts: python =3D 2.3 -Provides: %_bindir/%real_name Requires: %name-base Requires: %name-modules %name-modules-encodings Requires: %name-modules-curses %name-modules-xml %name-modules-compiler @@ -102,7 +105,6 @@ Group: Development/Python Provides: %real_name =3D %require_ver Provides: %name-relaxed =3D %version-%release Conflicts: %name-strict -Provides: %_bindir/%real_name Requires: %name-base Obsoletes: %python_name-relaxed <=3D %noversion_from =20 @@ -119,7 +121,7 @@ This is a python with relaxed conflicts: using with pyt= hon22 are allowed. %package base Summary: Base python modules and executables Group: Development/Python -Requires: %real_name =3D %require_ver +Provides: /usr/bin/python Provides: %python_name(os.path) Provides: %python_name(pwd) Obsoletes: %python_name-base <=3D %noversion_from @@ -635,20 +637,24 @@ chmod +x python.sh mv %buildroot{%_libdir/%python_name/config/lib%python_name.a,%_libdir/lib%= python_name.a} mv %buildroot{%_mandir/man1/python.1,%_mandir/man1/%python_name.1} =20 +%post base +[ -e /usr/bin/python ] || ln -snf %python_name /usr/bin/python +[ -e /usr/bin/pydoc ] || ln -snf pydoc%suffix_ver /usr/bin/pydoc + %post strict -ln -sf /usr/bin/%python_name /usr/bin/python -ln -sf /usr/bin/pydoc%suffix_ver /usr/bin/pydoc -ln -sf %_sysconfdir/emacs/site-start.d/python.el-%suffix_ver %_sysconfdir= /emacs/site-start.d/python.el +ln -sf %python_name /usr/bin/python +ln -sf pydoc%suffix_ver /usr/bin/pydoc +ln -sf python.el-%suffix_ver %_sysconfdir/emacs/site-start.d/python.el =20 %post relaxed %register_alternatives %python_name -- python pydoc =20 %triggerpostun strict -- python22, python23, python-relaxed, %python_name-= relaxed, python2.3, python2.3-relaxed -ln -sf /usr/bin/pydoc%suffix_ver /usr/bin/pydoc -ln -sf /usr/bin/%python_name /usr/bin/python -ln -sf %_sysconfdir/emacs/site-start.d/python.el-%suffix_ver %_sysconfdir= /emacs/site-start.d/python.el +ln -sf pydoc%suffix_ver /usr/bin/pydoc +ln -sf %python_name /usr/bin/python +ln -sf python.el-%suffix_ver %_sysconfdir/emacs/site-start.d/python.el for n in idle modulator pynche; do - ln -sf %_bindir/${n}%suffix_ver %_bindir/$n + ln -sf ${n}%suffix_ver %_bindir/$n done =20 %preun relaxed @@ -804,6 +810,18 @@ done %_libdir/%python_name/lib-dynload/_tkinter.so =20 %changelog +* Sun Mar 18 2007 Alexey Tourbin 2.4.4-alt8 +- this release prepares python-base to be part of base build system +- /usr/bin/python is now provided by python-base; no file-level + conflict is induced, and python-strict/relaxed logic must still work +- removed extra python dependencies from python-base; python-base + is now self-contained +- moved time.so, re.py, and string.py from python-modules to + python-base, so that python-base provides most common dependencies +- also moved parser.so, token.py, and symbol.py from python-modules-compil= er + to python-base, to satisfy rpm-build-python dependencies +- in %%post scripts, replaced absolute symbolic links with relative ones + * Mon Jan 08 2007 Fr. Br. George 2.4.4-alt7 - Documentation search path relocate - Replace many of 24 and 2.4 with macros (for upcoming 2.5) --oyi3v9V9xafcEDI/ Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.7 (GNU/Linux) iD8DBQFF/RRqfBKgtDjnu0YRAkgmAJ0aId49szlfng6F2Y74A3EL45gr/QCfSJQq CnHfBxBu7zD56gF2Hgkr+6Q= =9C1f -----END PGP SIGNATURE----- --oyi3v9V9xafcEDI/--