commit 3a444a23edbbe9a9b8e671310ee63a7c574ead35
Author: Petr Písař <ppisar@xxxxxxxxxx>
Date: Wed Sep 25 17:13:14 2013 +0200
2.006_90 bump
.gitignore | 1 +
perl-PDL.spec | 71 +++++++++++++++++++++++++++++++++++++++++----------------
sources | 2 +-
3 files changed, 53 insertions(+), 21 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 47bd9af..a836caf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ PDL-2.4.6.tar.gz
/PDL-2.4.8.tar.gz
/PDL-2.4.9.tar.gz
/PDL-2.4.10.tar.gz
+/PDL-2.006_90.tar.gz
diff --git a/perl-PDL.spec b/perl-PDL.spec
index c118a6d..0ef8659 100644
--- a/perl-PDL.spec
+++ b/perl-PDL.spec
@@ -1,6 +1,9 @@
+# Disable Proj support because it's not compatible anymore, bug #839651
+%{bcond_with proj}
+
Name: perl-PDL
-%global cpan_version 2.006
-Version: 2.6.0
+%global cpan_version 2.006_90
+Version: 2.6.0.90
Release: 1%{?dist}
Summary: The Perl Data Language
Group: Development/Libraries
@@ -42,59 +45,82 @@ BuildRequires: perl(strict)
BuildRequires: perl(vars)
BuildRequires: perl(warnings)
# Run-time:
+BuildRequires: perl(base)
BuildRequires: perl(constant)
BuildRequires: perl(Devel::REPL::Plugin)
BuildRequires: perl(DynaLoader)
+BuildRequires: perl(English)
BuildRequires: perl(Exporter)
BuildRequires: perl(Fcntl)
+BuildRequires: perl(fields)
BuildRequires: perl(File::Basename)
BuildRequires: perl(File::Copy)
-BuildRequires: perl(File::Map) >= 0.47
-BuildRequires: perl(File::Temp)
BuildRequires: perl(FileHandle)
+BuildRequires: perl(File::Map) >= 0.57
+BuildRequires: perl(File::Temp)
BuildRequires: perl(Filter::Simple) >= 0.88
BuildRequires: perl(Filter::Util::Call)
BuildRequires: perl(Inline) >= 0.43
+BuildRequires: perl(List::MoreUtils)
BuildRequires: perl(List::Util)
BuildRequires: perl(Module::Compile) >= 0.23
BuildRequires: perl(Moose)
BuildRequires: perl(namespace::clean)
BuildRequires: perl(overload)
+BuildRequires: perl(Pod::PlainText)
BuildRequires: perl(POSIX)
-BuildRequires: perl(SelfLoader)
BuildRequires: perl(Scalar::Util)
+BuildRequires: perl(SelfLoader)
+BuildRequires: perl(Symbol)
BuildRequires: perl(Text::Balanced) >= 1.89
# Tests:
BuildRequires: perl(Benchmark)
-BuildRequires: perl(English)
BuildRequires: perl(ExtUtils::testlib)
BuildRequires: perl(IO::String)
BuildRequires: perl(Test)
BuildRequires: perl(Test::More)
+BuildRequires: perl(Test::Warn)
# Optional tests:
BuildRequires: perl(Convert::UU)
BuildRequires: perl(Storable) >= 1.03
-# Needed by PDL::GIS::Proj, currently disabled
-# BuildRequires: proj-devel
-# BuildRequires: proj-nad
+%if %{with proj}
+# Needed by PDL::GIS::Proj
+BuildRequires: proj-devel
+BuildRequires: proj-nad
+%endif
# Need by PDL::IO::Browser, currently disabled
# BuildRequires: ncurses-devel
BuildRequires: sharutils
Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
-Requires: perl(File::Map) >= 0.47
+Requires: perl(File::Map) >= 0.57
+Requires: perl(File::Spec) >= 0.6
Requires: perl(Filter::Simple) >= 0.88
-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)
-Provides: perl(PGPLOT) perl(PDL::LiteF) perl(PDL::Lite)
-Provides: perl(PDL::Graphics::TriD) perl(PDL::Graphics::TriD::GL)
-Provides: perl(PDL::Graphics::TriD::Objects) perl(PDL::Graphics::TriD::Contours)
-Provides: perl(PDL::Graphics::TriD::Image) perl(PDL::Graphics::TriD::Tk)
+Requires: perl(Inline) >= 0.43
+Requires: perl(Module::Compile) >= 0.23
+Requires: perl(OpenGL) >= 0.65
+Requires: perl(Text::Balanced) >= 1.89
+Provides: perl(PDL::Config)
+Provides: perl(PDL::PP::CType)
+Provides: perl(PDL::PP::Dims)
+Provides: perl(PDL::PP::PDLCode)
+Provides: perl(PDL::PP::SymTab)
+Provides: perl(PDL::PP::XS)
+Provides: perl(PDL::Lite)
+Provides: perl(PDL::LiteF)
+Provides: perl(PDL::Graphics::TriD)
+Provides: perl(PDL::Graphics::TriD::GL)
+Provides: perl(PDL::Graphics::TriD::Contours)
+Provides: perl(PDL::Graphics::TriD::Image)
+Provides: perl(PDL::Graphics::TriD::Objects)
+Provides: perl(PGPLOT)
%{?perl_default_filter}
%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\((Tk|Win32::DDE::Client)\\)$
%global __provides_exclude %{?__provides_exclude:%__provides_exclude|}^perl\\(Inline\\)$
%global __provides_exclude %__provides_exclude|^perl\\(Win32.*\\)$
+# Remove under-specified dependencies
+%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\((Data::Dumper|File::Spec|Filter::Simple|Inline|Module::Compile|OpenGL|Text::Balanced)\\)$
%description
PDL ("Perl Data Language") gives standard Perl the ability to
@@ -108,10 +134,15 @@ such commercial packages as IDL and MatLab.
# Uncomment to enable PDL::IO::Browser
# %%patch0 -p1 -b .settings
%patch1 -p1 -b .hdf
+%if %{without proj}
%patch2 -p1 -b .proj
+%endif
+# Fix shebang
+sed -e 's,^#!/usr/bin/env perl,#!/usr/bin/perl,' -i Perldl2/pdl2
%build
-CFLAGS="%{optflags} -Wno-unused"
+# Optimization above -O0 segfaults tests, bug #914307
+CFLAGS="%{optflags} -Wno-unused -O0"
%ifarch ppc ppc64 s390 s390x
CFLAGS="$CFLAGS -fsigned-char"
%endif
@@ -135,7 +166,7 @@ export PERL5LIB=`pwd`/blib/lib
make test
%files
-%doc COPYING BUGS Changes Known_problems Release_Notes README
+%doc BUGS COPYING Changes Known_problems README Release_Notes TODO
%{_bindir}/*
%{perl_vendorarch}/Inline/*
%{perl_vendorarch}/PDL*
@@ -144,8 +175,8 @@ make test
%{_mandir}/man3/*.3*
%changelog
-* Wed Sep 25 2013 Petr Pisar <ppisar@xxxxxxxxxx> - 2.6.0-1
-- 2.006 bump
+* Wed Sep 25 2013 Petr Pisar <ppisar@xxxxxxxxxx> - 2.6.0.90-1
+- 2.006_90 bump
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@xxxxxxxxxxxxxxxxxxxxxxx> - 2.4.10-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
diff --git a/sources b/sources
index 4041950..2f445b9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-501665c1c82bf86d6545b88b8e692c73 PDL-2.4.10.tar.gz
+140e7dc1d4d678df03ae5332662fb5f6 PDL-2.006_90.tar.gz
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
perl-devel mailing list
perl-devel@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/perl-devel
