diff --git a/perl-PDL-2.4.1-long.patch b/perl-PDL-2.4.1-long.patch new file mode 100644 index 0000000..2eb6bd1 --- /dev/null +++ b/perl-PDL-2.4.1-long.patch @@ -0,0 +1,49 @@ +Index: PDL-2.4.1/Basic/Core/Dev.pm +=================================================================== +--- PDL-2.4.1.orig/Basic/Core/Dev.pm 2004-12-12 00:07:52.010537392 +0100 ++++ PDL-2.4.1/Basic/Core/Dev.pm 2004-12-12 00:09:07.904999680 +0100 +@@ -203,14 +203,14 @@ + # + # case PDL_L: + # { +-# long *xx = x.data; ++# PDL_Long *xx = x.data; + # for(i=0; invals == 1) + for(i=0;i<$COMP(rdim);i++) +- $COMP(sizes[i]) = *((long *)(size_pdl->data)); ++ $COMP(sizes[i]) = *((PDL_Long *)(size_pdl->data)); + + else if( size_pdl->nvals <= $COMP(rdim) &&size_pdl->ndims == 1) + for(i=0;i<$COMP(rdim);i++) + $COMP(sizes[i]) = ( (i < size_pdl->nvals) ? +- ((long *)(size_pdl->data))[i] : ++ ((PDL_Long *)(size_pdl->data))[i] : + 0 + ); + else { +@@ -795,7 +795,7 @@ + /* bad we don't have access to the parent piddle here... */ + + for(j=0;j<$COMP(rdim);j++) +- *(cptr++) = ((long *)(ind_pdl->data))[ioff + ind_pdl->dimincs[0] * j]; ++ *(cptr++) = ((PDL_Long *)(ind_pdl->data))[ioff + ind_pdl->dimincs[0] * j]; + + /* Increment the iterator -- the test increments, the body carries. */ + for(k=0; k<$COMP(itdim) && (++(iter[k]))>=($COMP(itdims)[k]) ;k++) diff --git a/perl-PDL.spec b/perl-PDL.spec index b7bfef1..11db787 100644 --- a/perl-PDL.spec +++ b/perl-PDL.spec @@ -2,7 +2,7 @@ Name: perl-PDL Version: 2.4.1 -Release: 6 +Release: 7 Summary: PDL Perl module License: distributable Group: Development/Libraries @@ -11,6 +11,7 @@ BuildRoot: %{_tmppath}/%{name}-root BuildRequires: perl >= 0:5.00503 Source0: PDL-%{version}.tar.gz Patch0: perl-PDL-settings.patch +Patch1: perl-PDL-2.4.1-long.patch Provides: perl(PDL::Config) perl(PDL::PP::CType) perl(PDL::PP::Dims) Provides: perl(PDL::PP::PDLCode) perl(PDL::PP::SymTab) perl(PDL::PP::XS) @@ -26,6 +27,7 @@ such commerical packages as IDL and MatLab. %prep %setup -q -n PDL-%{version} %patch0 -p1 -b .settings +%patch1 -p1 -b .long %build CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL PREFIX=$RPM_BUILD_ROOT/usr INSTALLDIRS=vendor @@ -65,6 +67,9 @@ fi %defattr(-,root,root) %changelog +* Sun Dec 12 2004 Miloslav Trmac - 2.4.1-7 +- Fix rangeb on 64-bit platforms (I hope) (#141413) + * Thu Nov 25 2004 Miloslav Trmac - 2.4.1-6 - Convert man page to UTF-8