From b1c7cd3b983b2d35f621edd236579a18a65e0434 Mon Sep 17 00:00:00 2001 From: Till Hofmann Date: Oct 09 2019 07:00:14 +0000 Subject: Update to 1.7.8, build with python3 Update the cmake patch to look for a python3 interpreter. We could also rely on the fact that /usr/bin/python is python3, but keeping the patch to explicitly find the interpreter with cmake is the better solution. --- diff --git a/.gitignore b/.gitignore index e2a5668..b3d1787 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ ginac-1.5.6.tar.bz2 /ginac-1.7.5.tar.bz2 /ginac-1.7.6.tar.bz2 /ginac-1.7.7.tar.bz2 +/ginac-1.7.8.tar.bz2 diff --git a/ginac.cmake-find-python.patch b/ginac.cmake-find-python.patch index 342dda3..a1f8574 100644 --- a/ginac.cmake-find-python.patch +++ b/ginac.cmake-find-python.patch @@ -1,12 +1,12 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index cdb18f09..33e3f18c 100644 +index cdb18f09..cc16cf05 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,6 +17,8 @@ string(REGEX REPLACE "^.*GINAC_LT_REVISION[ \t]+([0-9]+).*" "\\1" ginac_lt_revis math(EXPR ginaclib_soversion "${ginac_lt_current} - ${ginac_lt_age}") set(ginaclib_version ${ginaclib_soversion}.${ginac_lt_age}.${ginac_lt_revision}) -+find_package(PythonInterp 2 EXACT REQUIRED) ++find_package(PythonInterp 3 EXACT REQUIRED) + # make check enable_testing() diff --git a/ginac.spec b/ginac.spec index 4a9b020..3f5b52d 100644 --- a/ginac.spec +++ b/ginac.spec @@ -1,7 +1,7 @@ %global so_ver 6 Name: ginac -Version: 1.7.7 +Version: 1.7.8 Release: 1%{?dist} Summary: C++ library for symbolic calculations License: GPLv2+ @@ -16,7 +16,7 @@ BuildRequires: cln-devel BuildRequires: cmake BuildRequires: flex BuildRequires: doxygen -BuildRequires: python2 +BuildRequires: python3-devel BuildRequires: readline-devel BuildRequires: tex(dvips) BuildRequires: tex(latex) @@ -71,7 +71,7 @@ rm -frv %{buildroot}%{_infodir}/dir find %{buildroot} -name '*.la' -delete -print for f in $(find %{buildroot} -name "*.py") ; do - sed -i.orig "s:^#\!/usr/bin/env\s\+python:#!%{__python2}:" $f + sed -i.orig "s:^#\!/usr/bin/env\s\+python:#!%{__python3}:" $f touch -r $f.orig $f rm $f.orig done @@ -98,6 +98,10 @@ make check %{_bindir}/* %changelog +* Wed Oct 09 2019 Till Hofmann - 1.7.8-1 +- Update to 1.7.8 +- Build with python3 + * Sun Oct 06 2019 Till Hofmann - 1.7.7-1 - Update to 1.7.7 diff --git a/sources b/sources index ad77c3d..e14f193 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ginac-1.7.7.tar.bz2) = 890778ef2a7cb76873027d9505b24a129d5a683c28feda1e261f246bdb074b58eb29a295eafe36636d8f31172284b7e1a1d00037933394b2b8b22ec2a563b732 +SHA512 (ginac-1.7.8.tar.bz2) = 4d5a0e52108aee2438362d66d6b5f3e3a108855fc2c0ab2bc521ddc9a2a87c9b1404ae5304ba7d1dbcf6e985bfe26c730e14f3f46d63d0bdffe242f4a948c6a0