Merge branch 'DEVEL-2.13'

diff --combined parigp.spec
index 608b8bdfa79bb8b13fc822dfab416ec39185338b,1249de63a1688f982b87e7139b85d9a122379f66..dea03bd269ae30a94b7eb8cfc3fe682a9b36ce8a
--- 1/parigp.spec
--- 2/parigp.spec
+++ b/parigp.spec
@@@ -2,29 -2,31 +2,26 @@@
  # Conditional build:
  %bcond_without        tex     # TeX documentation
  #
- # latest perl Math::Pari (2.030518) doesn't know of pari >= 2.12
- # see DEVEL-2.13 branch for 2.13.x packaging try
- %define               pari_version            2.11.4
- %define               gp2c_version            0.0.12
 -# note: latest perl Math::Pari (2.030518) doesn't know of pari >= 2.12
 -# 2.13.1 with updated Math-Pari diff patch + Math-Pari 2.030518 with update patch:
 -# Failed 19/243 test programs. 176/1476 subtests failed.
 -# compared to 2.11.4 with Math-Pari 2.11-diff-all patch:
 -# Failed 20/229 test programs. 173/1477 subtests failed.
+ %define               pari_version            2.13.4
+ %define               gp2c_version            0.0.12pl1
  # because of previous 2.x versions with 8 minor digits, keep trailing zeros in package Version
- %define               math_pari_version       2.03051800
- %define               math_pari_fversion      2.030518
+ %define               math_pari_version       2.03052300
+ %define               math_pari_fversion      2.030523
  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:      20
+ Release:      1
  License:      GPL v2+
  Group:                Applications/Math
- #Source0:     http://pari.math.u-bordeaux.fr/pub/pari/unix/pari-%{pari_version}.tar.gz
- Source0:      http://pari.math.u-bordeaux.fr/pub/pari/OLD/2.11/pari-%{pari_version}.tar.gz
- # Source0-md5:        fb2968d7805424518fe44a59a2024afd
+ Source0:      http://pari.math.u-bordeaux.fr/pub/pari/unix/pari-%{pari_version}.tar.gz
+ # Source0-md5:        b624752c00b4b87b940fd98c910d8c09
  Source1:      http://pari.math.u-bordeaux.fr/pub/pari/packages/galdata.tgz
  # Source1-md5:        f9f61b2930757a785b568e5d307a7d75
  Source2:      http://pari.math.u-bordeaux.fr/pub/pari/GP2C/gp2c-%{gp2c_version}.tar.gz
- # Source2-md5:        ab29c383985d1b7d339189ecff31d40a
- Source3:      http://www.cpan.org/modules/by-module/Math/Math-Pari-%{math_pari_fversion}.zip
- # Source3-md5:        f0d1d9f803c92abff0d6349869a82699
+ # Source2-md5:        07e5959df2a08e519532a03ff5b8111f
+ Source3:      http://www.cpan.org/modules/by-module/Math/Math-Pari-%{math_pari_fversion}.tar.gz
+ # Source3-md5:        e5489cb047989bf6ef3f1fdc590ca736
  Source4:      %{name}.desktop
  Source5:      %{name}.png
  Patch0:               %{name}-target_arch.patch
@@@ -33,7 -35,6 +30,6 @@@ Patch3:               perl-Math-Pari-crash-workaroun
  Patch4:               perl-Math-Pari-noproccpuinfo.patch
  Patch5:               %{name}-noproccpuinfo.patch
  Patch6:               gmp-version.patch
- Patch7:               Math-Pari-escape-left-braces-in-regex.patch
  URL:          http://pari.math.u-bordeaux.fr/
  BuildRequires:        autoconf
  BuildRequires:        ctags
@@@ -49,7 -50,6 +45,7 @@@ BuildRequires:        texlive-csplai
  BuildRequires:        texlive-dvips
  BuildRequires:        texlive-fonts-cm
  BuildRequires:        texlive-format-pdflatex
 +BuildRequires:        texlive-latex-ams
  BuildRequires:        texlive-plain
  BuildRequires:        texlive-pdftex
  BuildRequires:        texlive-tex-babel
@@@ -180,7 -180,7 +176,7 @@@ Interfejs Perla do biblioteki PARI
  
  %prep
  %setup -q -n pari-%{pari_version} -a 2 -a 3
- patch -p1 < Math-Pari-%{math_pari_fversion}/patches/diff-2.11.0-all
+ patch -p1 < Math-Pari-%{math_pari_fversion}/patches/diff-2.13.3-all
  %patch0 -p1
  %patch2 -p1
  %patch5 -p1
@@@ -188,7 -188,6 +184,6 @@@
  cd Math-Pari-%{math_pari_fversion}
  %patch3 -p1
  %patch4 -p1
- %patch7 -p0
  
  %build
  # pari & parigp
@@@ -230,7 -229,7 +225,7 @@@ ln -sf .. par
        --datadir=%{_datadir}/parigp
  
  %{__make}
- %{?with_tex:%{__make} -j1 -C doc docall}
+ %{?with_tex:%{__make} -j1 -C doc}
  
  cd ..
  
@@@ -240,10 -239,7 +235,10 @@@ cp -f ../Olinux-%{_target_cpu}/paricfg.
  echo '#define DL_DFLT_NAME NULL' >>libPARI/paricfg.h
  
  %{__perl} Makefile.PL \
 -      INSTALLDIRS=vendor
 +      INSTALLDIRS=vendor \
 +%ifarch x32
 +      machine=none
 +%endif
  
  %{__make} \
        OPTIMIZE="%{rpmcflags} -I$(pwd)/../Olinux-%{_target_cpu}"
@@@ -296,7 -292,7 +291,7 @@@ rm -rf $RPM_BUILD_ROO
  %files
  %defattr(644,root,root,755)
  %doc AUTHORS CHANGES* COMPAT NEW README examples/Inputrc %{?with_tex:doc/*.pdf}
- %attr(755,root,root) %{_bindir}/gp-2.11
+ %attr(755,root,root) %{_bindir}/gp-2.13
  %attr(755,root,root) %{_bindir}/gp
  %attr(755,root,root) %{_bindir}/gphelp
  %attr(755,root,root) %{_bindir}/tex2mail
@@@ -315,7 -311,7 +310,7 @@@
  %files -n pari
  %defattr(644,root,root,755)
  %attr(755,root,root) %{_libdir}/libpari-gmp.so.*.*.*
- %attr(755,root,root) %ghost %{_libdir}/libpari-gmp.so.6
+ %attr(755,root,root) %ghost %{_libdir}/libpari-gmp.so.7
  %{_libdir}/parigp
  
  %files -n pari-devel