From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on sa.int.altlinux.org X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,SPF_PASS autolearn=unavailable version=3.2.5 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:date:message-id:subject :from:to:cc:content-type:content-transfer-encoding; bh=wqeMHpVkhllFh4cyBPbELxgQlJh7TIhZwp/p8RkMBG0=; b=gfbYo2r3CEth8Bxbsg7YzDcu7Miq3SJRyBS4Ye1YlDMpQYsMMayH/ouu4uUq5YBUtp bFFsgOu5PYtlikE19HbgNNFwTo8NICDJ5kWK9CHJ8WGLZKG9dkSPXiMQHa27XDplkir0 nJ6wXD+SNE9AOUNTMtp78/l7TNkcDQSd7jWd0= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:date:message-id:subject:from:to:cc:content-type :content-transfer-encoding; b=K6xhJdweA5NfZ6dlx5JjWTQp3b7OjyNHHiamULssFbAV7BDxlC9OvWaIYHLh1y9+cJ ChvdyNDbBi0knR7Ys1GCZif6VZFw9tnnEcKRHdhkwOqWRlqMOChuxccPahoIulr4LR+D NJIyQ/5wquEsRncujYdjgDKlw/HylYXtUzXok= MIME-Version: 1.0 Date: Mon, 15 Feb 2010 17:43:55 +0700 Message-ID: <8d778a621002150243p3753bd6sace4c14dd6d3280d@mail.gmail.com> From: =?KOI8-R?B?5dfHxc7JyiDyz9PUz9fDxdc=?= To: ldv@altlinux.org Content-Type: text/plain; charset=KOI8-R Content-Transfer-Encoding: quoted-printable Cc: real@altlinux.org, asy@altlinux.org, devel@lists.altlinux.org Subject: [devel] AM_PYTHON_PATH und mailutils X-BeenThere: devel@lists.altlinux.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: ALT Linux Team development discussions List-Id: ALT Linux Team development discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Feb 2010 10:44:23 -0000 Archived-At: List-Archive: List-Post: =F0=D2=C9=D7=C5=D4! =E4=CC=D1 ldv@: =E4=CC=D1 AM_PATH_PYTHON =D0=D2=C5=C4=CC=C1=C7=C1=C0 =D4=C1=CB=CF=C5: http://git.altlinux.org/people/real/packages/automake_1.11.git?p=3Dautomake= _1.11.git;a=3Dcommitdiff;h=3D3e686343c9a004a2812073dceec247a239abb0f3 =EF=CE =CE=C9=DE=C5=C7=CF =CE=C5 =DA=C1=D4=D2=CF=CE=C5=D4, =C5=D3=CC=C9 =D3= =D0=C5=C3=C9=C1=CC=D8=CE=CF =CE=C5 =C9=D3=D0=CF=CC=D8=DA=CF=D7=C1=D4=D8 =DC= =D4=D5 =C6=C9=DE=D5. =F4=C1=CB =DE=D4=CF, =CE=C1=C4=C5=C0=D3=D8, =C9 =C1=D0=D3=D4=D2=C9=CD =D0=D2=CF=D0=D5= =D3=D4=C9=D4. Fix m4/python.m4 for archdep/noarch using --- diff --git a/m4/python.m4 b/m4/python.m4 index 1dc3985..95a0989 100644 --- a/m4/python.m4 +++ b/m4/python.m4 @@ -34,6 +34,8 @@ # numbers and dots only. AC_DEFUN([AM_PATH_PYTHON], [ +AC_ARG_VAR([python_noarch], +[python_noarch set python archdep/(=3D0)noarch(=3D1 or =3D"", default is = 1]) dnl Find a Python interpreter. Python versions prior to 2.0 are not dnl supported. (2.0 was released on October 16, 2000). m4_define_default([_AM_PYTHON_INTERPRETER_LIST], @@ -121,82 +123,124 @@ python2.1 python2.0]) else am_py_prefix=3D$prefix fi - am_cv_python_pythondir=3D`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix=3D'$am_py_prefix'))" 2>/dev/null || - echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"` - case $am_cv_python_pythondir in - $am_py_prefix*) - am__strip_prefix=3D`echo "$am_py_prefix" | sed 's|.|.|g'` - am_cv_python_pythondir=3D`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"` - ;; - *) - case $am_py_prefix in - /usr|/System*) ;; - *) - am_cv_python_pythondir=3D$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-= packages - ;; - esac - ;; - esac - ]) - AC_SUBST([pythondir], [$am_cv_python_pythondir]) - - dnl pkgpythondir -- $PACKAGE directory under pythondir. Was - dnl PYTHON_SITE_PACKAGE in previous betas, but this naming is - dnl more consistent with the rest of automake. - - AC_SUBST([pkgpythondir], [\${pythondir}/$PACKAGE]) - - dnl pyexecdir -- directory for installing python extension modules - dnl (shared libraries) - dnl Query distutils for this directory. distutils does not exist in - dnl Python 1.5, so we fall back to the hardcoded directory if it - dnl doesn't work. - AC_CACHE_CHECK([for $am_display_PYTHON extension module directory], - [am_cv_python_pyexecdir], - [if test "x$exec_prefix" =3D xNONE - then - am_py_exec_prefix=3D$am_py_prefix - else - am_py_exec_prefix=3D$exec_prefix - fi - am_cv_python_pyexecdir=3D`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix=3D'$am_py_exec_prefix'= ))" 2>/dev/null || - echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"` - case $am_cv_python_pyexecdir in - $am_py_exec_prefix*) - am__strip_prefix=3D`echo "$am_py_exec_prefix" | sed 's|.|.|g'` - am_cv_python_pyexecdir=3D`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"` - ;; - *) - case $am_py_exec_prefix in - /usr|/System*) ;; - *) - am_cv_python_pyexecdir=3D$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION= /site-packages - ;; - esac - ;; - esac - ]) - AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir]) - - dnl pkgpyexecdir -- $(pyexecdir)/$(PACKAGE) - - AC_SUBST([pkgpyexecdir], [\${pyexecdir}/$PACKAGE]) - - dnl Run any user-specified action. - $2 - fi - -]) - - -# AM_PYTHON_CHECK_VERSION(PROG, VERSION, [ACTION-IF-TRUE], [ACTION-IF-FALS= E]) -# ------------------------------------------------------------------------= --- -# Run ACTION-IF-TRUE if the Python interpreter PROG has version >=3D VERSI= ON. -# Run ACTION-IF-FALSE otherwise. -# This test uses sys.hexversion instead of the string equivalent (first -# word of sys.version), in order to cope with versions such as 2.2c1. -# This supports Python 2.0 or higher. (2.0 was released on October 16, 200= 0). -AC_DEFUN([AM_PYTHON_CHECK_VERSION], + if test "$python_noarch" =3D "0" && test "`uname -m`" =3D "x86_64" ; t= hen + libsuff=3D'64' + am_cv_python_pythondir=3D`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1))" 2>/dev/null || + echo "$PYTHON_PREFIX/lib$libsuff/python$PYTHON_VERSION/site-packages"` + case $am_cv_python_pythondir in + $am_py_prefix*) + am__strip_prefix=3D`echo "$am_py_prefix" | sed 's|.|.|g'` + #am_cv_python_pythondir=3D`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"` + ;; + *) + case $am_py_prefix in + /usr|/System*) ;; + *) + am_cv_python_pythondir=3D$PYTHON_PREFIX/lib$libsuff/python$PYTHON_= VERSION/site-packages + ;; + esac + ;; + esac + else + libsuff=3D + am_cv_python_pythondir=3D`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,'$PYTHON_PREFIX'))" 2>/dev/null || + echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"` + case $am_cv_python_pythondir in + $am_py_prefix*) + am__strip_prefix=3D`echo "$am_py_prefix" | sed 's|.|.|g'` + #am_cv_python_pythondir=3D`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"` + ;; + *) + case $am_py_prefix in + /usr|/System*) ;; + *) + am_cv_python_pythondir=3D$PYTHON_PREFIX/lib/python$PYTHON_VERSION/= site-packages + ;; + esac + ;; + esac + fi + ]) + AC_SUBST([pythondir], [$am_cv_python_pythondir]) + + dnl pkgpythondir -- $PACKAGE directory under pythondir. Was + dnl PYTHON_SITE_PACKAGE in previous betas, but this naming is + dnl more consistent with the rest of automake. + + AC_SUBST([pkgpythondir], [\${pythondir}/$PACKAGE]) + + dnl pyexecdir -- directory for installing python extension modules + dnl (shared libraries) + dnl Query distutils for this directory. distutils does not exist in + dnl Python 1.5, so we fall back to the hardcoded directory if it + dnl doesn't work. + AC_CACHE_CHECK([for $am_display_PYTHON extension module directory], + [am_cv_python_pyexecdir], + [if test "x$exec_prefix" =3D xNONE + then + am_py_exec_prefix=3D$am_py_prefix + else + am_py_exec_prefix=3D$exec_prefix + fi + if test "$python_noarch" =3D "0" && test "`uname -m`" =3D "x86_64" ; t= hen + libsuff=3D'64' + am_cv_python_pyexecdir=3D`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1))" 2>/dev/null || + echo "$PYTHON_EXEC_PREFIX/lib$libsuff/python$PYTHON_VERSION/site-pack= ages"` + case $am_cv_python_pyexecdir in + $am_py_exec_prefix*) + am__strip_prefix=3D`echo "$am_py_exec_prefix" | sed 's|.|.|g'` + #am_cv_python_pyexecdir=3D`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"` + ;; + *) + case $am_py_exec_prefix in + /usr|/System*) ;; + *) + am_cv_python_pyexecdir=3D$PYTHON_EXEC_PREFIX/lib$libfuff/python$PYTH= ON_VERSION/site-packages + ;; + esac + ;; + esac + else + libsuff=3D + am_cv_python_pyexecdir=3D`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0))" 2>/dev/null || + echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"` + case $am_cv_python_pyexecdir in + $am_py_exec_prefix*) + am__strip_prefix=3D`echo "$am_py_exec_prefix" | sed 's|.|.|g'` + #am_cv_python_pyexecdir=3D`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"` + ;; + *) + case $am_py_exec_prefix in + /usr|/System*) ;; + *) + am_cv_python_pyexecdir=3D$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSIO= N/site-packages + ;; + esac + ;; + esac + fi + ]) + AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir]) + + dnl pkgpyexecdir -- $(pyexecdir)/$(PACKAGE) + + AC_SUBST([pkgpyexecdir], [\${pyexecdir}/$PACKAGE]) + + dnl Run any user-specified action. + $2 + fi + + ]) + + + # AM_PYTHON_CHECK_VERSION(PROG, VERSION, [ACTION-IF-TRUE], [ACTION-IF-FAL= SE]) + # -----------------------------------------------------------------------= ---- + # Run ACTION-IF-TRUE if the Python interpreter PROG has version >=3D VERS= ION. + # Run ACTION-IF-FALSE otherwise. + # This test uses sys.hexversion instead of the string equivalent (first + # word of sys.version), in order to cope with versions such as 2.2c1. + # This supports Python 2.0 or higher. (2.0 was released on October 16, 20= 00). + AC_DEFUN([AM_PYTHON_CHECK_VERSION], [prog=3D"import sys # split strings by '.' and convert to numeric. Append some zeros # because we need at least 4 digits for the hex conversion. =E1 =DC=D4=CF =C4=CC=D1 asy@ (mailutils): 1. =EF=D3=D4=C1=D7=CC=D1=C5=CD =F7=C1=DB mailutils/configure.ac, =D7=D0=D2= =CF=DE=C5=CD, =CF=CE =C9 =D7 =CD=CF=A3=CD =D2=C5=D0=CF=DA=C9=D4=CF=D2=C9=C9 =D7=CF=D3=D3=D4=C1=CE=CF=D7=CC=C5=CE. 2. http://git.altlinux.org/people/real/packages/mailutils.git?p=3Dmailutils= .git;a=3Dcommitdiff;h=3D5d1c4941972466829996be6bb04d16275f9ce96d =F1 =D4=C1=CD =CE=C5=CD=CE=CF=C7=CF =D0=CF=C4=D2=C9=C8=D4=CF=D7=C1=CC =D3= =D0=C5=CB, =CE=CF =D3=C9=CC=D8=CE=CF =CE=C5 =D5=D7=CC=C5=CB=C1=CC=D3=D1. = =E4=CC=D1 =F7=C1=D3 =C7=CC=C1=D7=CE=CF=C5 - =D0=C1=D2=C1=CD=C5=D4=D2 python_noarch=3D0 (=C5=C4= =C9=CE=C9=C3=C1 =C9=CC=C9 =D7=CF=CF=C2=DD=C5 =D0=D2=CF=D0=D5=DD=C5=CE =D0=C1=D2=C1=CD=C5=D4=D2 - =C9 =D7=D3=A3 =C2=D5=C4=C5=D4 =D3=CF=C2=C9=D2=C1= =D4=D8=D3=D1 =CB=C1=CB =D3=C5=CA=DE=C1=D3, =D7=D3=A3 =D0=C9=C8=C1=D1 =D7 %_libexecdir/python2.6) =C9 =DA=C1=CD=C5=CE=C1 %make_build =CE=C1 %make (= =D3=CC=CF=CD=C1=CC=C1=D3=D8 =D0=C1=D2=C1=CC=CC=C5=CC=D8=CE=C1=D1 =D3=C2=CF=D2=CB=C1). - Fixed install of python --- diff --git a/mailutils.spec b/mailutils.spec index b0268cf..4f088b6 100644 --- a/mailutils.spec +++ b/mailutils.spec @@ -209,22 +209,23 @@ Python bindings for GNU Mailutils. %setup -q %endif -%patch1 -p0 -sed -i "s|@TOP@|$PWD|" configure.ac +#patch1 -p0 gzip ChangeLog %build +rm -f aclocal.m4 %autoreconf -sed -i 's|get_python_lib[^)]*|get_python_lib(1|' aclocal.m4 %set_verify_elf_method unresolved=3Drelaxed CFLAGS=3D"-ltinfo" -%configure --enable-mh-utils --with-mh-bindir=3D%_libexecdir/mu-mh +%configure --enable-mh-utils --with-mh-bindir=3D%_libexecdir/mu-mh \ + python_noarch=3D0 -%make_build +# parallel build is broken +%make %check @@ -358,9 +359,8 @@ rm -f $RPM_BUILD_ROOT%python_sitelibdir/mailutils/c_api= .la %python_sitelibdir/mailutils/*.py* %changelog -* Sun Feb 07 2010 Eugeny A. Rostovtsev (REAL) 2.1-alt0.20091105.4 -- Fixed get_python_lib using -- configure: .la war +* Mon Feb 15 2010 Eugeny A. Rostovtsev (REAL) 2.1-alt0.20091105.4 +- Fixed install of python * Sun Jan 31 2010 Sergey Y. Afonin 2.1-alt0.20091105.3 - created symlinks (for better exchangeability with the mailx package): --=20 REAL aka =E5=D7=C7=C5=CE=C9=CA =F2=CF=D3=D4=CF=D7=C3=C5=D7, =D0=D2=CF=C7=D2= =C1=CD=CD=C9=D3=D4 =E3=EE=E9=F4 =EB=C5=CD=E7=F5