diff --git a/.cvsignore b/.cvsignore index a50d59e..278e784 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ PDL-2.4.4.tar.gz +PDL-Graphics-PLplot-0.47.tar.gz diff --git a/perl-PDL-2.4.3-plparseopts.patch b/perl-PDL-2.4.3-plparseopts.patch deleted file mode 100644 index 1c57ac2..0000000 --- a/perl-PDL-2.4.3-plparseopts.patch +++ /dev/null @@ -1,67 +0,0 @@ ---- PDL-2.4.3/Graphics/PLplot/plplot.pd.plparseopts 2005-05-03 08:19:47.000000000 -0600 -+++ PDL-2.4.3/Graphics/PLplot/plplot.pd 2008-09-04 14:27:33.000000000 -0600 -@@ -1573,7 +1573,7 @@ - # constants in plplot.h available in Perl in the form of functions. It - # should be then possible to write code like this: - # --# plParseOpts (\@ARGV, PL_PARSE_SKIP | PL_PARSE_NOPROGRAM); -+# plparseopts (\@ARGV, PL_PARSE_SKIP | PL_PARSE_NOPROGRAM); - - sub create_low_level_constants { - my $defn = shift; -@@ -1599,7 +1599,7 @@ - - create_low_level_constants (<<'EODEF'); - --# Definitions used in plParseOpts -+# Definitions used in plparseopts - - PL_PARSE_PARTIAL - PL_PARSE_FULL -@@ -2100,6 +2100,46 @@ - ## Parse PLplot options given in @ARGV-like arrays - # - -+pp_def ('plparseopts', -+ GenericTypes => [D], -+ Pars => 'int [o] retval()', -+ OtherPars => 'SV* argv; int mode', -+ Doc => 'FIXME: documentation here!', -+ Code => ' -+ SV* sv = $COMP (argv); -+ AV* arr; -+ int argc, newargc, i, retval; -+ char** args; -+ -+ if ( !(SvROK (sv) && SvTYPE (SvRV (sv)) == SVt_PVAV)) { -+ barf("plparseopts requires an array ref"); -+ } -+ -+ arr = (AV*) SvRV (sv); -+ newargc = argc = av_len (arr) + 1; -+ args = calloc (argc , sizeof (char*)); -+ -+ for (i = 0; i < argc; i++) { -+ STRLEN len; -+ args[i] = SvPV (* av_fetch (arr, i, 0), len); -+ } -+ -+ $retval() = plparseopts (&newargc, args, $COMP (mode)); -+ -+ for (i = 0; i < newargc; i++) -+ av_push (arr, newSVpv (args[i], 0)); -+ -+ for (i = 0; i < argc; i++) -+ av_shift (arr); -+ -+ free (args); -+ ', -+); -+ -+# -+## Parse PLplot options given in @ARGV-like arrays (deprecated) -+# -+ - pp_def ('plParseOpts', - GenericTypes => [D], - Pars => 'int [o] retval()', diff --git a/perl-PDL-2.4.4-test_plplot.patch b/perl-PDL-2.4.4-test_plplot.patch deleted file mode 100644 index 06a821d..0000000 --- a/perl-PDL-2.4.4-test_plplot.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- PDL-2.4.4/t/plplot.t.test_plplot 2008-11-12 21:14:04.000000000 -0700 -+++ PDL-2.4.4/t/plplot.t 2008-11-29 16:04:42.000000000 -0700 -@@ -245,7 +245,7 @@ - - ok (sum(pdl(0.1, 0.85, 0.1, 0.9) - pdl($dev_xmin, $dev_xmax, $dev_ymin, $dev_ymax)) == 0, - "plgvpd call works correctly"); --ok (sum(pdl(-0.0001, 10.0001, -0.001, 100.001) - pdl($wld_xmin, $wld_xmax, $wld_ymin, $wld_ymax)) == 0, -+ok (sum(pdl(0, 10, 0, 100) - pdl($wld_xmin, $wld_xmax, $wld_ymin, $wld_ymax)) == 0, - "plgvpw call works correctly"); - - # Test shade plotting (low level interface) diff --git a/perl-PDL.spec b/perl-PDL.spec index 5aa3316..ae57433 100644 --- a/perl-PDL.spec +++ b/perl-PDL.spec @@ -1,12 +1,15 @@ +%global plplotver 0.47 + Name: perl-PDL Version: 2.4.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Perl Data Language Group: Development/Libraries License: GPL+ or Artistic Url: http://pdl.perl.org/ Source0: http://search.cpan.org/CPAN/authors/id/C/CH/CHM/PDL-%{version}.tar.gz +Source1: http://search.cpan.org/CPAN/authors/id/D/DH/DHUNT/PDL-Graphics-PLplot-%{plplotver}.tar.gz Patch0: perl-PDL-settings.patch Patch1: perl-PDL-2.4.2-fix_ia64_sdump.patch Patch2: perl-PDL-2.4.4-cleanup.patch @@ -16,9 +19,6 @@ Patch5: perl-PDL-2.4.3-hdf.patch Patch6: perl-PDL-2.4.4-Xext.patch Patch7: perl-PDL-2.4.3-fortran.patch Patch8: perl-PDL-2.4.3-test_hdf.patch -Patch9: perl-PDL-2.4.4-test_plplot.patch -#See http://sourceforge.net/tracker/index.php?func=detail&aid=2093833&group_id=612&atid=300612 -Patch12: perl-PDL-2.4.3-plparseopts.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl >= 1:5.6.1 @@ -53,7 +53,12 @@ such commercial packages as IDL and MatLab. %prep -%setup -q -n PDL-%{version} +%setup -q -n PDL-%{version} -b 1 +# Use newer plplot.pd +cp $RPM_BUILD_DIR/PDL-Graphics-PLplot-%{plplotver}/plplot.pd Graphics/PLplot/plplot.pd +cp $RPM_BUILD_DIR/PDL-Graphics-PLplot-%{plplotver}/t/plplot.t t/plplot.t +# Strip separate version informaion +sed -i -e '/^\$VERSION =/d' Graphics/PLplot/plplot.pd %patch0 -p1 -b .settings %patch1 -p1 %patch2 -p1 -b .cleanup @@ -63,8 +68,6 @@ such commercial packages as IDL and MatLab. %patch6 -p1 -b .Xext %patch7 -p1 -b .fortran %patch8 -p1 -b .patch_hdf -%patch9 -p1 -b .test_plplot -%patch12 -p1 -b .plparseopts # Provides: explicitly filter perl(Inline) cat <<__EOF__ > %{name}-findperlprovides @@ -150,6 +153,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Jan 1 2009 Orion Poplawski - 2.4.4-2 +- Use PDL-Graphics-PLplot-0.47 to support latest plplot + * Sat Nov 29 2008 Orion Poplawski - 2.4.4-1 - Update to 2.4.4 - New source URL diff --git a/sources b/sources index 7a3649b..a3baf67 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 1c3e8f2fd001a8b48687fb277bc16eed PDL-2.4.4.tar.gz +f57df85c3cb3b1e731601beed90e2871 PDL-Graphics-PLplot-0.47.tar.gz