From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Date: Thu, 7 Nov 2019 21:21:56 +0300 From: "Vladimir D. Seleznev" To: devel@lists.altlinux.org Message-ID: <20191107182156.GA1803808@portlab> References: <20191107155612.49CBD84402E3@gitery.altlinux.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20191107155612.49CBD84402E3@gitery.altlinux.org> User-Agent: Mutt/1.10.1 (2018-07-13) Subject: Re: [devel] [SCM] m/mathomatic/mathomatic.spec 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: Thu, 07 Nov 2019 18:21:58 -0000 Archived-At: List-Archive: List-Post: On Thu, Nov 07, 2019 at 03:56:12PM +0000, SpecBot wrote: > commit dfd8a9c7e63ec45e2b5c529875a9b60c8de9d90d > Author: Andrey Bychkov > Date: Thu Oct 31 15:00:00 2019 +0300 > > 240032: mathomatic-16.0.5-alt3 > > - python2 -> python3 > > diff --git a/m/mathomatic/mathomatic.spec b/m/mathomatic/mathomatic.spec > index 3d2c36d..50d144f 100644 > --- a/m/mathomatic/mathomatic.spec > +++ b/m/mathomatic/mathomatic.spec > @@ -1,6 +1,7 @@ > Name: mathomatic > Version: 16.0.5 > -Release: alt2 > +Release: alt3 > + > Summary: Small, portable symbolic math program > License: LGPL > Group: Sciences/Mathematics > @@ -9,8 +10,9 @@ Url: http://www.mathomatic.org/ > Source: %name-%version.tar.bz2 > Patch: %name-16.0.1-m4.patch > > -# Automatically added by buildreq on Thu Jun 24 2010 > BuildRequires: libncurses-devel libreadline-devel > +BuildRequires: python-tools-2to3 > + > > %description > Mathomatic is a small, portable symbolic math program that can automatically > @@ -21,10 +23,19 @@ Gesslein II and has been under development since 1986. > %prep > %setup > %patch -p1 > + > # Hack out 15.6.3 install -Cv > sed -i 's/-Cv//' makefile > sed -i 's/-Cv//' primes/makefile > > +# py2 -> py3 > +find -type f \( -name 'matho-mult' -o -name 'matho-sum' -o -name 'primorial' \ > + -o -name 'factorial' \) -exec 2to3 -w -n '{}' + > + ^ Этот способ не работает. george@ добавляет: 2to3 в большинстве случаев _не_ генерирует рабочий код. Это просто вспомогательный инструмент для _ручного_ перевода, и после каждого перевода их надо проверять. Если хочется избавиться от проектов на Python2, лучше удалять пакеты, а не делать их неработающими. > +sed -i 's|#!/usr/bin/python|#!/usr/bin/python3|' \ > + $(find ./ -type f \( -name 'matho-mult' -o -name 'matho-sum' \ > + -o -name 'primorial' -o -name 'factorial' \)) > + > %build > %make_build READLINE=1 mathdocdir=%_defaultdocdir/%name-%version > %make_build -C primes READLINE=1 mathdocdir=%_defaultdocdir/%name-%version > @@ -48,7 +59,11 @@ make test > %_niconsdir/%name.png > %_desktopdir/%name.desktop > > + > %changelog > +* Thu Oct 31 2019 Andrey Bychkov 16.0.5-alt3 > +- python2 -> python3 > + > * Tue Feb 05 2019 Fr. Br. George 16.0.5-alt2 > - Rebuild with libreadline.so.7 -- С уважением, Владимир Селезнев