commit c1170d8449e53ce42b19ff1933ef54214bf220ee
Author: Marcin Krol <[email protected]>
Date: Wed Nov 13 12:21:27 2013 +0000
- updated parigp to 2.5.5, gp2c to 0.0.8, updated termcap patch,
removed no-proccpuinfo patch (no longer needed)
- release 5 (perl-Math-Pari version not changed)
parigp-no-proccpuinfo.patch | 33 ---------------------------------
parigp-termcap.patch | 9 +++++----
parigp.spec | 16 +++++++---------
3 files changed, 12 insertions(+), 46 deletions(-)
---
diff --git a/parigp.spec b/parigp.spec
index 5592fff..6a42b4f 100644
--- a/parigp.spec
+++ b/parigp.spec
@@ -3,22 +3,22 @@
%bcond_without tex # don't build tex documentation
#
%include /usr/lib/rpm/macros.perl
-%define pari_version 2.5.4
-%define gp2c_version 0.0.7pl5
+%define pari_version 2.5.5
+%define gp2c_version 0.0.8
%define math_pari_version 2.01080605
Summary: Number Theory-oriented Computer Algebra System
Summary(pl.UTF-8): Komputerowy system obliczeń algebraicznych zorientowany
na metody teorii liczb
Name: parigp
Version: %{pari_version}
-Release: 4
+Release: 5
License: GPL
Group: Applications/Math
Source0:
ftp://megrez.math.u-bordeaux.fr/pub/pari/unix/pari-%{pari_version}.tar.gz
-# Source0-md5: b7f3a2775d57cc49e4c0af2e1479acd2
+# Source0-md5: fbd6402f8d3d3213b0633ab9ef4a63d0
Source1: ftp://megrez.math.u-bordeaux.fr/pub/pari/packages/galdata.tgz
# Source1-md5: f9f61b2930757a785b568e5d307a7d75
Source2:
ftp://megrez.math.u-bordeaux.fr/pub/pari/GP2C/gp2c-%{gp2c_version}.tar.gz
-# Source2-md5: 14579071992af3d43f62c2d9926fd3bb
+# Source2-md5: b29599e06aea3b0a7d370de3d955fdb2
Source3:
http://www.cpan.org/modules/by-module/Math/Math-Pari-%{math_pari_version}.tar.gz
# Source3-md5: ccb3da2bdce184a5df3f52cfa8b43a85
Source4: %{name}.desktop
@@ -26,9 +26,8 @@ Source5: %{name}.png
Patch0: %{name}-target_arch.patch
Patch1: %{name}-termcap.patch
Patch2: %{name}-arch.patch
-Patch3: %{name}-no-proccpuinfo.patch
-Patch4: perl-Math-Pari-crash-workaround.patch
-Patch5: perl-Math-Pari-update.patch
+Patch3: perl-Math-Pari-crash-workaround.patch
+Patch4: perl-Math-Pari-update.patch
URL: http://pari.math.u-bordeaux.fr/
BuildRequires: autoconf
BuildRequires: ctags
@@ -177,7 +176,6 @@ Interfejs Perla do biblioteki PARI.
%patch2 -p1
%patch3 -p1
%patch4 -p1
-%patch5 -p1
%build
# pari & parigp
diff --git a/parigp-no-proccpuinfo.patch b/parigp-no-proccpuinfo.patch
deleted file mode 100644
index 95dc9e6..0000000
--- a/parigp-no-proccpuinfo.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- pari-2.1.5/config/arch-osname.orig 2004-03-05 19:41:45.000000000 +0100
-+++ pari-2.1.5/config/arch-osname 2004-03-05 20:09:37.036819216 +0100
-@@ -16,7 +16,7 @@
- case $arch in
- sparc64) arch=sparcv9;;
- parisc*) arch=hppa;;
-- sparc) case "`cat /proc/cpuinfo`" in
-+ sparc) case "generic" in
- *SuperSparc*) arch=sparcv8_super;;
- *TMS390Z5[05]*) arch=sparcv8_super;; # SuperSparc I or II
- *TMS390S1[05]*) arch=sparcv8_micro;; # MicroSparc I
---- pari-2.1.7/gp2c-0.0.7pl5/config/arch-osname.orig 2001-03-18
21:55:19.000000000 +0100
-+++ pari-2.1.7/gp2c-0.0.7pl5/config/arch-osname 2004-03-05
20:09:50.367792600 +0100
-@@ -16,7 +16,7 @@
- osf1) case "$5" in alpha) arch=alpha;; esac;;
- cygwin*) arch=$HOSTTYPE;;
- linux) arch=`uname -m`
-- case "`cat /proc/cpuinfo`" in
-+ case "generic" in
- *SuperSparc*) arch=sparcv8_super;;
- *TMS390Z5[05]*) arch=sparcv8_super;; # SuperSparc I or II
- *TMS390S1[05]*) arch=sparcv8_micro;; # MicroSparc I
---- pari-2.1.7/Math-Pari-2.01080605/utils/Math/PariBuild.pm.orig
2005-01-20 03:04:46.000000000 +0100
-+++ pari-2.1.7/Math-Pari-2.01080605/utils/Math/PariBuild.pm 2005-01-22
00:01:08.135658528 +0100
-@@ -801,7 +801,7 @@
- chomp($machine = `uname -m`);
- $machine = 'sparcv9' if $machine eq 'sparc64';
- $machine = 'hppa' if $machine =~ /^parisc/;
-- if ($machine eq 'sparc' and -e '/proc/cpuinfo' && -R '/proc/cpuinfo') {
-+ if ($machine eq 'sparc' and 0 && -e '/proc/cpuinfo' && -R
'/proc/cpuinfo') {
- open IN, '/proc/cpuinfo' or die "open /proc/cpuinfo: $!";
- local $/ = undef; # Needed?
- my $info = <IN>;
diff --git a/parigp-termcap.patch b/parigp-termcap.patch
index 7b719a2..e145346 100644
--- a/parigp-termcap.patch
+++ b/parigp-termcap.patch
@@ -1,15 +1,16 @@
---- pari-2.3.5/config/get_readline~ 2008-03-31 13:43:59.000000000 +0200
-+++ pari-2.3.5/config/get_readline 2010-06-12 18:51:23.870317635 +0200
-@@ -120,12 +120,6 @@
+--- pari-2.5.5/config/get_readline.orig 2013-11-13 12:12:47.148846810
+0000
++++ pari-2.5.5/config/get_readline 2013-11-13 12:14:11.926846829 +0000
+@@ -98,13 +98,6 @@
if test -n "$try"; then
rl_ncurses=$ncurses
need_tgetent=
- else # give termcap a try
+- pth="$with_readline_lib $libpth"
- lib=termcap; . ./locatelib
- if test -n "$try"; then
- rl_termcap=$termcap
- need_tgetent=
- fi
fi
+ pth=$opth
fi
- # Readline -- CFLAGS
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/parigp.git/commitdiff/c1170d8449e53ce42b19ff1933ef54214bf220ee
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
