diff --git a/perl-PDL-2.4.3-gsl.patch b/perl-PDL-2.4.3-gsl.patch new file mode 100644 index 0000000..18c6691 --- /dev/null +++ b/perl-PDL-2.4.3-gsl.patch @@ -0,0 +1,29 @@ +--- PDL-2.4.3/Lib/GSL/Makefile.PL.gsl 2004-01-12 13:00:06.000000000 -0700 ++++ PDL-2.4.3/Lib/GSL/Makefile.PL 2008-03-04 10:05:54.000000000 -0700 +@@ -29,11 +29,16 @@ + return ($inc,$lib); + } + ++sub decimate { # version string -> number ++ $_[0] =~ /(\d+)\.(\d+)/; ++ return int($1*100 + $2); ++} ++ + # these will be used in the subdirs + ($GSL_includes, $GSL_libs) = get_gsl_libs(); + + # Version check +-my $MINVERSION = "1.3"; ++my $MINVERSION = decimate("1.3"); + my $version = `gsl-config --version`; + chomp $version; + +@@ -41,7 +46,7 @@ + warn "\tno GSL version info found (gsl-config not installed?)\n\n"; + $version = 'UNKNOWN VERSION'; + } +-if ($version =~ /UNKNOWN VERSION/ || $version lt "$MINVERSION") { ++if ($version =~ /UNKNOWN VERSION/ || decimate($version) lt "$MINVERSION") { + warn "\n Not building GSL modules: GSL version $version found, need at least $MINVERSION\n\n"; + write_dummy_make("Not building GSL modules: GSL version $version found, but need at least $MINVERSION"); + } else { diff --git a/perl-PDL.spec b/perl-PDL.spec index 88c6545..f591e13 100644 --- a/perl-PDL.spec +++ b/perl-PDL.spec @@ -1,6 +1,6 @@ Name: perl-PDL Version: 2.4.3 -Release: 6%{?dist} +Release: 7%{?dist} Summary: The Perl Data Language Group: Development/Libraries @@ -15,7 +15,8 @@ Patch4: perl-PDL-2.4.3-x86_64.patch Patch5: perl-PDL-2.4.3-hdf.patch Patch6: perl-PDL-2.4.3-Xext.patch Patch7: perl-PDL-2.4.3-fortran.patch -Patch8: perl-PDL-2.4.3-test_hdf.patch +Patch8: perl-PDL-2.4.3-test_hdf.patch +Patch9: perl-PDL-2.4.3-gsl.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl >= 1:5.6.1 @@ -59,6 +60,7 @@ such commercial packages as IDL and MatLab. %patch6 -p1 -b .Xext %patch7 -p1 -b .fortran %patch8 -p1 -b .patch_hdf +%patch9 -p1 -b .gsl # Provides: explicitly filter perl(Inline) cat <<__EOF__ > %{name}-findperlprovides @@ -120,6 +122,7 @@ exit 0 %endif %check +unset DISPLAY export PERL5LIB=`pwd`/blib/lib make test @@ -139,6 +142,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Mar 04 2008 Orion Poplawski - 2.4.3-7 +- Add patch to build GSL support with GSL 1.10 +- unset DISPLAY in %%check for mock builds + * Tue Feb 26 2008 Marcela Maslanova - 2.4.3-6 - remove two of hdf test for some time, because can't be build