rpms/perl-Math-Pari/devel perl-Math-Pari-2.010802-docs-and-testsuite.patch, NONE, 1.1 perl-Math-Pari-2.010802-no-fake-version.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 perl-Math-Pari.spec, 1.17, 1.18 sources, 1.7, 1.8

Thu Oct 29 13:23:55 UTC 2009

Author: pghmcfc

Update of /cvs/pkgs/rpms/perl-Math-Pari/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30621

Modified Files:
	.cvsignore perl-Math-Pari.spec sources 
Added Files:
	perl-Math-Pari-2.010802-docs-and-testsuite.patch 
	perl-Math-Pari-2.010802-no-fake-version.patch 
Log Message:
Update to 2.010802
Use system pari library (version 2.3.4) rather than a local build (requires patches to Makefile.PL to get docs and test suite)
Enforce tight dependency on system pari version to ensure we stay in step
Fix test suite so that 64-bit builds work with pari-2.3.4
Use standard filter macros for provides filter


perl-Math-Pari-2.010802-docs-and-testsuite.patch:
 Makefile.PL |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

--- NEW FILE perl-Math-Pari-2.010802-docs-and-testsuite.patch ---
--- Math-Pari-2.010802/Makefile.PL.orig	2009-10-29 10:47:15.349216927 +0000
+++ Math-Pari-2.010802/Makefile.PL	2009-10-29 11:12:54.651293844 +0000
@@ -102,11 +102,13 @@
 }
 
 my %opts;
+
+# We want to build the docs and the test suite even though we're using the system pari lib
+build_tests $paridir;				# Convert the test suite
+make_pod 'libPARI.pod', '-to_pod', $paridir;	# Now the docs
+make_pod 'libPARI.dumb.pod', '-to_dumb_pod', $paridir;
+
 unless ($common::parilib) {
-  build_tests $paridir;		# Convert the test suite
-  make_pod 'libPARI.pod', '-to_pod', $paridir; # Now the docs
-  make_pod 'libPARI.dumb.pod', '-to_dumb_pod', $paridir;
-  # ... and paricfg.h
   %opts = build_paricfg($paridir, $common::do_configure, $pari_version);
 
   if ($ENV{MATH_PARI_REPORT_CODES}) {

perl-Math-Pari-2.010802-no-fake-version.patch:
 Makefile.PL |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE perl-Math-Pari-2.010802-no-fake-version.patch ---
--- Math-Pari-2.010802/Makefile.PL.orig	2009-10-27 22:17:12.000000000 +0000
+++ Math-Pari-2.010802/Makefile.PL	2009-10-29 10:47:15.349216927 +0000
@@ -44,7 +44,7 @@
 EOP
 
 if ($common::parilib) {
-  $pari_version = '2001004';	# XXXX How to get a correct one?
+  $pari_version = '@@@OUR-PARI-VERSION@@@';	# XXXX How to get a correct one?
   $define = '-DNO_HIGHLEVEL_PARI';
   print <<EOP;
 Trying to use existing PARI library (at $common::parilib)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Math-Pari/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	11 Feb 2009 10:49:21 -0000	1.7
+++ .cvsignore	29 Oct 2009 13:23:54 -0000	1.8
@@ -1,2 +1,2 @@
-Math-Pari-2.010801.tar.gz
-pari-2.1.7.tgz
+Math-Pari-2.010802.tar.gz
+pari-2.3.4.tar.gz


Index: perl-Math-Pari.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Math-Pari/devel/perl-Math-Pari.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- perl-Math-Pari.spec	26 Jul 2009 11:14:43 -0000	1.17
+++ perl-Math-Pari.spec	29 Oct 2009 13:23:54 -0000	1.18
@@ -1,37 +1,38 @@
-# This package includes the pari library source even though that is
-# being introduced to Fedora Extras in its own right (#169703). The
-# rationale for this is:
-# (a)	This package patches the library source code
-# (b)	This package integrates very tightly with the library and may
-#	break if the library is changed underneath it
-# (c)	Functionality is lost if built against an external PARI library
-#	(see the INSTALL file in the distribution)
-
-# The perl module version used to indicate the latest PARI version that
-# it was tested against, but due to an oversight 2.010800 was released
-# and broke the numbering scheme, so we need to hardcode both version
-# numbers from now on (see CPAN RT#35493)
-%define module_version	2.010801
-%define pari_version	2.1.7
+# This package includes the pari library source even though we link
+# against the system version of the library; the library source is
+# needed to build the documentation for this perl binding and also
+# to enhance the test suite, by providing additional tests from the
+# main library test suite.
+#
+# Since this binding is tightly linked to the main library, we
+# have to enforce a tight dependency on the main pari library version
+# so that we stay in step properly.
+%global pari_version	2.3.4
+%global pari_int_version %(echo %{pari_version} | %{__perl} -pi -e 's/(\\d+)\\.(\\d+)\\.(\\d+)/sprintf("%d%03d%03d",$1,$2,$3)/e')
 
 Summary:	Perl interface to PARI
 Name:		perl-Math-Pari
-Version:	%{module_version}
-Release:	4%{?dist}
+Version:	2.010802
+Release:	1%{?dist}
 License:	GPL+ or Artistic
 Group:		Development/Libraries
 Url:		http://search.cpan.org/dist/Math-Pari/
-Source0:	http://search.cpan.org/CPAN/authors/id/I/IL/ILYAZ/modules/Math-Pari-%{module_version}.tar.gz
-Source1:	http://pari.math.u-bordeaux.fr/pub/pari/unix/OLD/pari-%{pari_version}.tgz
+Source0:	http://search.cpan.org/CPAN/authors/id/I/IL/ILYAZ/modules/Math-Pari-%{version}.tar.gz
+Source1:	http://pari.math.u-bordeaux.fr/pub/pari/unix/pari-%{pari_version}.tar.gz
+Patch0:		perl-Math-Pari-2.010802-no-fake-version.patch
+Patch1:		perl-Math-Pari-2.010802-docs-and-testsuite.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildRequires:	perl(ExtUtils::MakeMaker)
 
-# don't "provide" private Perl libs or the redundant unversioned perl(Math::Pari) one
-%global _use_internal_dependency_generator 0
-%global __deploop() while read FILE; do /usr/lib/rpm/rpmdeps -%{1} ${FILE}; done | /bin/sort -u
-%global __find_provides /bin/sh -c "%{__grep} -v '%{perl_vendorarch}/.*\\.so$' | %{__deploop P} | %{__grep} -Fvx 'perl(Math::Pari)'"
-%global __find_requires /bin/sh -c "%{__deploop R}"
+# Enforce dependency against same version of pari that we're built for
+# The runtime dependency will hopefully change to pari-libs soon (#530565)
+BuildRequires:	pari-devel%{?_isa} = %{pari_version}
+Requires:	pari%{?_isa} = %{pari_version}
+
+# Don't "provide" private Perl libs or the redundant unversioned perl(Math::Pari)
+%filter_from_provides /^perl(Math::Pari)$/d
+%{?perl_default_filter}
 
 %description
 This package is a Perl interface to the famous library PARI for numerical/
@@ -39,19 +40,30 @@ scientific/ number-theoretic calculation
 as Perl functions, and (almost) seamless merging of PARI and Perl data.
 
 %prep
-%setup -q -n Math-Pari-%{module_version} -a 1
+%setup -q -n Math-Pari-%{version} -a 1
 
 # Remove spurious executable permission bits
 %{__chmod} -x Changes README Pari.pm PariInit.pm func_codes.h Pari.xs
 
+# If 64-bit test results missing, they should be copied from 32-bit test results
+cd pari-%{pari_version}/src/test/in
+for test in *; do
+	[ ! -f ../64/${test} ] && %{__cp} -a ../32/${test} ../64/${test}
+done
+cd -
+
+# Don't use a fake version number when we can use a real one
+%patch0 -p1
+%{__sed} -i -e s/@@@OUR-PARI-VERSION@@@/%{pari_int_version}/ Makefile.PL
+
+# We want to build the docs and test suite from the local pari sources
+%patch1 -p1
+
 %build
-# machine=linux-none needed to avoid breakage of 64-bit builds
-# other flags cribbed from pari.spec (#169703)
-export DLCFLAGS=-fPIC
 %{__perl} Makefile.PL \
 	INSTALLDIRS=vendor \
-	OPTIMIZE="%{optflags} -fomit-frame-pointer" \
-	machine=none
+	OPTIMIZE="-I%{_includedir}/pari %{optflags}" \
+	parilib="-lpari"
 %{__make} %{?_smp_mflags}
 
 %install
@@ -82,6 +94,14 @@ export DLCFLAGS=-fPIC
 %exclude %{_mandir}/man3/Math::libPARI.dumb.3pm*
 
 %changelog
+* Thu Oct 29 2009 Paul Howarth <paul at city-fan.org> - 2.010802-1
+- Update to 2.010802
+- Use system pari library (version 2.3.4) rather than a local build
+  (requires patches to Makefile.PL to get docs and test suite)
+- Enforce tight dependency on system pari version to ensure we stay in step
+- Fix test suite so that 64-bit builds work with pari-2.3.4
+- Use standard filter macros for provides filter
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.010801-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Math-Pari/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	11 Feb 2009 10:49:21 -0000	1.7
+++ sources	29 Oct 2009 13:23:54 -0000	1.8
@@ -1,2 +1,2 @@
-c0628a5ad79a53a22188aca476ea45ce  Math-Pari-2.010801.tar.gz
-357b7a42e89e2761a5367bbcbfcca5f2  pari-2.1.7.tgz
+f843b0b19da0a0a044851d980881dbc9  Math-Pari-2.010802.tar.gz
+35c896266e4257793387ba22d5d76078  pari-2.3.4.tar.gz


