packages: parigp/parigp-no-proccpuinfo.patch, parigp/parigp.spec, parigp/pe...
qboosh
qboosh at pld-linux.org
Tue Feb 21 16:20:46 CET 2012
Author: qboosh Date: Tue Feb 21 15:20:46 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- updated: pari 2.5.1, gp2c 0.0.7pl1, perl-Math-Pari 2.01080605
- updated no-proccpuinfo, perl-Math-Pari-crash-workaround patches
- added perl-Math-Pari-update patch (needed to build module with pari 2.4+)
- (x)emacs files no longer included in pari - separated to xemacs-parigp-mode-pkg.spec
---- Files affected:
packages/parigp:
parigp-no-proccpuinfo.patch (1.6 -> 1.7) , parigp.spec (1.110 -> 1.111) , perl-Math-Pari-crash-workaround.patch (1.6 -> 1.7) , perl-Math-Pari-update.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/parigp/parigp-no-proccpuinfo.patch
diff -u packages/parigp/parigp-no-proccpuinfo.patch:1.6 packages/parigp/parigp-no-proccpuinfo.patch:1.7
--- packages/parigp/parigp-no-proccpuinfo.patch:1.6 Sat Jun 12 19:05:37 2010
+++ packages/parigp/parigp-no-proccpuinfo.patch Tue Feb 21 16:20:40 2012
@@ -9,8 +9,8 @@
*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.5pl9/config/arch-osname.orig 2001-03-18 21:55:19.000000000 +0100
-+++ pari-2.1.7/gp2c-0.0.5pl9/config/arch-osname 2004-03-05 20:09:50.367792600 +0100
+--- pari-2.1.7/gp2c-0.0.7pl1/config/arch-osname.orig 2001-03-18 21:55:19.000000000 +0100
++++ pari-2.1.7/gp2c-0.0.7pl1/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;;
@@ -20,8 +20,8 @@
*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.01080604/utils/Math/PariBuild.pm.orig 2005-01-20 03:04:46.000000000 +0100
-+++ pari-2.1.7/Math-Pari-2.01080604/utils/Math/PariBuild.pm 2005-01-22 00:01:08.135658528 +0100
+--- 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';
================================================================
Index: packages/parigp/parigp.spec
diff -u packages/parigp/parigp.spec:1.110 packages/parigp/parigp.spec:1.111
--- packages/parigp/parigp.spec:1.110 Fri Oct 7 12:15:23 2011
+++ packages/parigp/parigp.spec Tue Feb 21 16:20:40 2012
@@ -4,24 +4,24 @@
%bcond_without tex # don't build tex documentation
#
%include /usr/lib/rpm/macros.perl
-%define pari_version 2.3.5
-%define gp2c_version 0.0.5pl9
-%define math_pari_version 2.01080604
+%define pari_version 2.5.1
+%define gp2c_version 0.0.7pl1
+%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: 1
License: GPL
Group: Applications/Math
Source0: ftp://megrez.math.u-bordeaux.fr/pub/pari/unix/pari-%{pari_version}.tar.gz
-# Source0-md5: 6077c6db56fdd32e39a06a9bf320e1f7
+# Source0-md5: d267dd1be4839f209217c8fff615478e
Source1: ftp://megrez.math.u-bordeaux.fr/pub/pari/galdata.tgz
# Source1-md5: 25eab5f9dfdb8715b9ace8cd68210425
Source2: ftp://megrez.math.u-bordeaux.fr/pub/pari/GP2C/gp2c-%{gp2c_version}.tar.gz
-# Source2-md5: 746811f01af37b463a4bf3e981e5ea55
-Source3: http://search.cpan.org/CPAN/authors/id/I/IL/ILYAZ/modules/Math-Pari-%{math_pari_version}.tar.gz
-# Source3-md5: 27f5999671fe2a29cfd2e8c8a1f9308e
+# Source2-md5: 3365354cd4954360cdbe9bfe7defa992
+Source3: http://search.cpan.org/CPAN/modules/by-module/Math/Math-Pari-%{math_pari_version}.tar.gz
+# Source3-md5: ccb3da2bdce184a5df3f52cfa8b43a85
Source4: %{name}.desktop
Source5: %{name}.png
Patch0: %{name}-target_arch.patch
@@ -29,8 +29,10 @@
Patch2: %{name}-arch.patch
Patch3: %{name}-no-proccpuinfo.patch
Patch4: perl-Math-Pari-crash-workaround.patch
+Patch5: perl-Math-Pari-update.patch
URL: http://pari.math.u-bordeaux.fr/
BuildRequires: autoconf
+BuildRequires: ctags
BuildRequires: perl-devel >= 1:5.8.0
BuildRequires: readline-devel >= 4.2
BuildRequires: rpm-perlprov >= 3.0.3-16
@@ -172,18 +174,6 @@
jest wymagana. Uwaga: do uruchamiania programów w środowisku PARI/GP
należy używać gp2c-run.
-%package -n xemacs-parigp-mode-pkg
-Summary: PARI/GP mode for Octave
-Summary(pl.UTF-8): Tryb edycji plików PARI/GP do XEmacsa
-Group: Applications/Editors/Emacs
-Requires: xemacs
-
-%description -n xemacs-parigp-mode-pkg
-PARI/GP editing mode for Xemacs.
-
-%description -n xemacs-parigp-mode-pkg -l pl.UTF-8
-Tryb edycji plików PARI/GP do Xemacsa.
-
%package -n perl-Math-Pari
Summary: Math-Pari perl module
Summary(pl.UTF-8): Moduł perla Math-Pari
@@ -203,6 +193,7 @@
%patch2 -p1
%patch3 -p1
%patch4 -p1
+%patch5 -p1
%build
# pari & parigp
@@ -215,10 +206,12 @@
--share-prefix=%{_datadir}
%{__make} -C Olinux-%{_target_cpu} all \
+ CC="%{__cc}" \
CFLAGS="%{rpmcflags} -fno-strict-aliasing -fomit-frame-pointer -fPIC"
+%{__make} ctags
+
%{?with_tex:%{__make} -C doc docpdf}
-src/make_vi_tags src
%ifarch %{ix86}
ln -s Olinux-%{_target_cpu} Olinux-ix86
%endif
@@ -242,12 +235,14 @@
# math-pari
cd Math-Pari-%{math_pari_version}
+cp -f ../Olinux-%{_target_cpu}/paricfg.h libPARI/paricfg.h
+echo '#define DL_DFLT_NAME NULL' >>libPARI/paricfg.h
%{__perl} Makefile.PL \
INSTALLDIRS=vendor
%{__make} \
- OPTIMIZE="%{rpmcflags}"
+ OPTIMIZE="%{rpmcflags} -I$(pwd)/../Olinux-%{_target_cpu}"
# %{__make} test
@@ -273,16 +268,6 @@
# galdata
tar zxvf %{SOURCE1} -C $RPM_BUILD_ROOT%{_datadir}/parigp/galdata
-# xemacs-parigp-mode-pkg
-install -d $RPM_BUILD_ROOT%{_datadir}/xemacs-packages/lisp/parigp-mode
-cp -a emacs/*.el $RPM_BUILD_ROOT%{_datadir}/xemacs-packages/lisp/parigp-mode
-cat <<EOF >$RPM_BUILD_ROOT%{_datadir}/xemacs-packages/lisp/parigp-mode/auto-autoloads.el
-(autoload 'gp-mode "pari" nil t)
-(autoload 'gp-script-mode "pari" nil t)
-(autoload 'gp "pari" nil t)
-(autoload 'gpman "pari" nil t)
-EOF
-
# gp2c
%{__make} install -C gp2c-%{gp2c_version} \
DESTDIR=$RPM_BUILD_ROOT
@@ -291,10 +276,11 @@
%{__make} install -C Math-Pari-%{math_pari_version} \
DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT%{_mandir}/man1/pari.1
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/pari.1
echo ".so gp.1" > $RPM_BUILD_ROOT%{_mandir}/man1/pari.1
-rm -rf $RPM_BUILD_ROOT%{_datadir}/parigp/{examples,doc}
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/parigp/{examples,doc}
+%{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/Math/libPARI*.pod
%clean
rm -rf $RPM_BUILD_ROOT
@@ -304,27 +290,27 @@
%files
%defattr(644,root,root,755)
-%doc AUTHORS Announce* CHANGES COMPAT MACHINES NEW README
-%doc examples/Inputrc
-%{?with_tex:%doc doc/*.pdf}
-%attr(755,root,root) %{_bindir}/gp-2.3
+%doc AUTHORS CHANGES* COMPAT MACHINES NEW README examples/Inputrc %{?with_tex:doc/*.pdf}
+%attr(755,root,root) %{_bindir}/gp-2.5
%attr(755,root,root) %{_bindir}/gp
%attr(755,root,root) %{_bindir}/gphelp
%attr(755,root,root) %{_bindir}/tex2mail
%dir %{_datadir}/parigp
+%{_datadir}/parigp/PARI
%{_datadir}/parigp/misc
%{_datadir}/parigp/pari.desc
%{_mandir}/man1/[!g]*.1*
%{_mandir}/man1/gp.1*
%{_mandir}/man1/gp-*.1*
%{_mandir}/man1/gphelp.1*
-%{_desktopdir}/*.desktop
-%{_pixmapsdir}/*
+%{_desktopdir}/parigp.desktop
+%{_pixmapsdir}/parigp.png
%files -n pari
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libpari.so.*.*
-%ghost %attr(755,root,root) %{_libdir}/libpari.so.2
+%attr(755,root,root) %{_libdir}/libpari-gmp.so.*.*.*
+%ghost %attr(755,root,root) %{_libdir}/libpari-gmp.so.3
+%{_libdir}/parigp
%files -n pari-devel
%defattr(644,root,root,755)
@@ -344,11 +330,6 @@
%defattr(644,root,root,755)
%{_datadir}/parigp/galdata
-%files -n xemacs-parigp-mode-pkg
-%defattr(644,root,root,755)
-%doc emacs/pariemacs.txt
-%{_datadir}/xemacs-packages/lisp/*
-
%files gp2c
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/gp2c*
@@ -360,11 +341,15 @@
%files -n perl-Math-Pari
%defattr(644,root,root,755)
%doc Math-Pari-%{math_pari_version}/{Changes,README,TODO}
-%{perl_vendorarch}/Math/*.pm
+%{perl_vendorarch}/Math/Pari.pm
+%{perl_vendorarch}/Math/PariInit.pm
%dir %{perl_vendorarch}/auto/Math/Pari
%{perl_vendorarch}/auto/Math/Pari/Pari.bs
%attr(755,root,root) %{perl_vendorarch}/auto/Math/Pari/Pari.so
-%{_mandir}/man3/*
+%{_mandir}/man3/Math::Pari.3pm*
+%{_mandir}/man3/Math::PariInit.3pm*
+%{_mandir}/man3/Math::libPARI.3pm*
+%{_mandir}/man3/Math::libPARI.dumb.3pm*
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -372,6 +357,12 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.111 2012/02/21 15:20:40 qboosh
+- updated: pari 2.5.1, gp2c 0.0.7pl1, perl-Math-Pari 2.01080605
+- updated no-proccpuinfo, perl-Math-Pari-crash-workaround patches
+- added perl-Math-Pari-update patch (needed to build module with pari 2.4+)
+- (x)emacs files no longer included in pari - separated to xemacs-parigp-mode-pkg.spec
+
Revision 1.110 2011/10/07 10:15:23 lisu
- rel 4
================================================================
Index: packages/parigp/perl-Math-Pari-crash-workaround.patch
diff -u packages/parigp/perl-Math-Pari-crash-workaround.patch:1.6 packages/parigp/perl-Math-Pari-crash-workaround.patch:1.7
--- packages/parigp/perl-Math-Pari-crash-workaround.patch:1.6 Sat Jun 12 19:05:37 2010
+++ packages/parigp/perl-Math-Pari-crash-workaround.patch Tue Feb 21 16:20:40 2012
@@ -8,8 +8,8 @@
where POINTER_VAL is just value of pointer to already existing Pari
object (which may be destroyed later!).
---- pari-2.3.5/Math-Pari-2.01080604/Pari.xs.orig 2004-01-31 10:06:08.000000000 +0100
-+++ pari-2.3.5/Math-Pari-2.01080604/Pari.xs 2004-05-15 21:11:38.894463600 +0200
+--- pari-2.3.5/Math-Pari-2.01080605/Pari.xs.orig 2004-01-31 10:06:08.000000000 +0100
++++ pari-2.3.5/Math-Pari-2.01080605/Pari.xs 2004-05-15 21:11:38.894463600 +0200
@@ -1285,6 +1285,13 @@
SV* nextsv;
long ret=0;
================================================================
Index: packages/parigp/perl-Math-Pari-update.patch
diff -u /dev/null packages/parigp/perl-Math-Pari-update.patch:1.1
--- /dev/null Tue Feb 21 16:20:46 2012
+++ packages/parigp/perl-Math-Pari-update.patch Tue Feb 21 16:20:40 2012
@@ -0,0 +1,84 @@
+--- pari-2.5.1/Math-Pari-2.01080605/Pari.xs.orig 2012-02-19 14:58:30.321452391 +0100
++++ pari-2.5.1/Math-Pari-2.01080605/Pari.xs 2012-02-19 16:17:25.268277599 +0100
+@@ -547,7 +547,7 @@
+ && lgef(x)==4 /* 2 terms */
+ && (gcmp0((GEN)x[2])) /* Free */
+ && (gcmp1((GEN)x[3]))) { /* Leading */
+- s = varentries[ordvar[varn(x)]]->name;
++ s = varentries[varn(x)]->name;
+ goto repeat;
+ }
+ goto ignore;
+@@ -765,8 +765,8 @@
+ }
+
+
+-PariOUT perlOut={svputc, svputs, svOutflush, NULL};
+-PariOUT perlErr={svErrputc, svErrputs, svErrflush, svErrdie};
++PariOUT perlOut={svputc, svputs, svOutflush};
++PariOUT perlErr={svErrputc, svErrputs, svErrflush};
+
+ static GEN
+ my_ulongtoi(ulong uv)
+@@ -934,7 +934,7 @@
+ || ((2 * sizeof(long) == sizeof(IV)) && !HAVE_UVs && in[2] < 0) )
+ goto do_nv;
+ uv = in[2];
+- uv = (uv << TWOPOTBYTES_IN_LONG) + in[3];
++ uv = (uv << (TWOPOTBITS_IN_LONG-3)) + in[3];
+ break;
+ default:
+ goto do_nv;
+@@ -1025,7 +1025,7 @@
+ #endif
+
+ #ifndef pariK1
+-# define pariK1 (0.103810253/(BYTES_IN_LONG/4)) /* log(10)/(SL*log(2)) */
++# define pariK1 (0.103810253/(sizeof(long)/4)) /* log(10)/(SL*log(2)) */
+ #endif
+
+ long
+@@ -1324,7 +1324,7 @@
+ moveoffstack_newer_than((SV *) GENfirstOnStack);
+ }
+
+-UV
++void
+ allocatemem(UV newsize)
+ {
+ if (newsize) {
+@@ -1332,7 +1332,6 @@
+ parisize = allocatemoremem(newsize);
+ perlavma = sentinel = avma;
+ }
+- return parisize;
+ }
+
+
+@@ -3466,8 +3465,8 @@
+ else
+ warn("`%s' is an obsolete Pari function name", name);
+ }
+- if (ep && (EpVALENCE(ep) < EpUSER
+- /* && ep>=fonctions && ep < fonctions+NUMFUNC) */)) {
++ if (ep /* && (EpVALENCE(ep) < EpUSER
++ && ep>=fonctions && ep < fonctions+NUMFUNC)) */) {
+ /* Builtin */
+ IV table_valence = 99;
+
+@@ -4016,7 +4015,7 @@
+
+ #else /* !( HAVE_UVs ) */
+
+-unsigned long
++void
+ allocatemem(newsize = 0)
+ unsigned long newsize
+
+--- pari-2.5.1/Math-Pari-2.01080605/func_codes.h.orig 2004-02-01 10:27:30.000000000 +0100
++++ pari-2.5.1/Math-Pari-2.01080605/func_codes.h 2012-02-19 21:26:18.835564839 +0100
+@@ -587,3 +587,4 @@
+ return PERL_constant_NOTFOUND;
+ }
+
++extern entree functions_basic[];
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/parigp/parigp-no-proccpuinfo.patch?r1=1.6&r2=1.7&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/parigp/parigp.spec?r1=1.110&r2=1.111&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/parigp/perl-Math-Pari-crash-workaround.patch?r1=1.6&r2=1.7&f=u
More information about the pld-cvs-commit
mailing list