jplesnik pushed to perl-PDL (master). "2.008 bump"
notifications at fedoraproject.org
notifications at fedoraproject.org
Mon May 25 11:48:45 UTC 2015
From 147e69e76f6e481b0fa2bc509b5f3d6e229a0854 Mon Sep 17 00:00:00 2001
From: Jitka Plesnikova <jplesnik at redhat.com>
Date: Mon, 25 May 2015 13:47:27 +0200
Subject: 2.008 bump
diff --git a/.gitignore b/.gitignore
index b543697..cdd8b98 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ PDL-2.4.6.tar.gz
/PDL-2.4.10.tar.gz
/PDL-2.006_90.tar.gz
/PDL-2.007.tar.gz
+/PDL-2.008.tar.gz
diff --git a/PDL-2.007-Basic-Core-Declare-dependecies-on-generated-header-f.patch b/PDL-2.007-Basic-Core-Declare-dependecies-on-generated-header-f.patch
deleted file mode 100644
index 82b2d35..0000000
--- a/PDL-2.007-Basic-Core-Declare-dependecies-on-generated-header-f.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From ef7e9cbf22fbe947b123303329efb114198a8757 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar at redhat.com>
-Date: Tue, 10 Feb 2015 14:38:29 +0100
-Subject: [PATCH] Basic/Core: Declare dependecies on generated header files
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Parallel build can fail because generated C sources requires generated
-header files. This patch adds the missing dependency declarations.
-
-Signed-off-by: Petr Písař <ppisar at redhat.com>
----
- Basic/Core/Makefile.PL | 9 ++++++---
- 1 file changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/Basic/Core/Makefile.PL b/Basic/Core/Makefile.PL
-index a6fc6bc..795ed2c 100644
---- a/Basic/Core/Makefile.PL
-+++ b/Basic/Core/Makefile.PL
-@@ -258,18 +258,21 @@ PDL::Core::Dev::postamble().
- # there must be a more elegant way of saying that
- # certain files have additional dependencies!
-
--pdlthread.c :: pdlcore.h\n"
-+pdlthread.c :: pdl.h pdlcore.h\n"
- ."
-
--pdlhash.c :: pdlcore.h\n"
-+pdlhash.c :: pdl.h pdlcore.h\n"
- ."
-
--pdlapi.c :: pdlcore.h\n"
-+pdlapi.c :: pdl.h pdlcore.h\n"
- ."
-
- pdlmagic.c :: pdlcore.h\n"
- ."
-
-+pdlsections.c :: pdl.h pdlcore.h\n"
-+."
-+
- Core.pm :: Core.pm.PL Types.pm badsupport.p\n"
- . make_from_PL('Core.pm')
- ."
---
-1.9.3
-
diff --git a/PDL-2.6.0.90-Compile-Slatec-code-as-PIC.patch b/PDL-2.6.0.90-Compile-Slatec-code-as-PIC.patch
index 7d5a80b..2b389d4 100644
--- a/PDL-2.6.0.90-Compile-Slatec-code-as-PIC.patch
+++ b/PDL-2.6.0.90-Compile-Slatec-code-as-PIC.patch
@@ -16,15 +16,14 @@ Signed-off-by: Petr Písař <ppisar at redhat.com>
Lib/Slatec/Makefile.PL | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
-diff --git a/Lib/Minuit/Makefile.PL b/Lib/Minuit/Makefile.PL
-index 35dcc44..e59ab9b 100644
---- a/Lib/Minuit/Makefile.PL
-+++ b/Lib/Minuit/Makefile.PL
-@@ -146,13 +146,12 @@ sub MY::postamble {
- $mycompiler = $f77->compiler();
- $mycflags = $f77->cflags();
- my $orig = pdlpp_postamble_int(@::pack);
-- $hack_64bit = ($Config{archname}=~m/x86_64/ ?" -fPIC " : "");
+diff -up PDL-2.008/Lib/Minuit/Makefile.PL.orig PDL-2.008/Lib/Minuit/Makefile.PL
+--- PDL-2.008/Lib/Minuit/Makefile.PL.orig 2015-05-25 10:40:25.504280235 +0200
++++ PDL-2.008/Lib/Minuit/Makefile.PL 2015-05-25 10:41:31.262090495 +0200
+@@ -135,13 +135,12 @@ undef &MY::postamble; # suppress warning
+ my $mycompiler = $f77->compiler();
+ my $mycflags = $f77->cflags();
+ my $orig = pdlpp_postamble_int(@pack);
+- my $hack_64bit = ($Config{archname}=~m/x86_64/ ?" -fPIC " : "");
$orig =~ s/:\s*minuit\.pd/: minuit.pd/;
$orig .= join "\n",map {
("
@@ -35,15 +34,14 @@ index 35dcc44..e59ab9b 100644
" )} @minuitfiles;
if (!defined($PDL::Config{MINUIT_LIB})){
-diff --git a/Lib/Slatec/Makefile.PL b/Lib/Slatec/Makefile.PL
-index 86ad3be..9e716db 100644
---- a/Lib/Slatec/Makefile.PL
-+++ b/Lib/Slatec/Makefile.PL
-@@ -136,13 +136,12 @@ sub MY::postamble {
- $mycompiler = $f77->compiler();
- $mycflags = $f77->cflags();
- my $orig = pdlpp_postamble_int(@::pack);
-- $hack_64bit = ($Config{archname}=~m/x86_64/ ?" -fPIC " : "");
+diff -up PDL-2.008/Lib/Slatec/Makefile.PL.orig PDL-2.008/Lib/Slatec/Makefile.PL
+--- PDL-2.008/Lib/Slatec/Makefile.PL.orig 2015-05-25 10:41:48.991308954 +0200
++++ PDL-2.008/Lib/Slatec/Makefile.PL 2015-05-25 10:42:20.934702247 +0200
+@@ -125,13 +125,12 @@ undef &MY::postamble; # suppress warning
+ my $mycompiler = $f77->compiler();
+ my $mycflags = $f77->cflags();
+ my $orig = pdlpp_postamble_int(@pack);
+- my $hack_64bit = ($Config{archname}=~m/x86_64/ ?" -fPIC " : "");
$orig =~ s/:\s*slatec\.pd/: slatec.pd/;
$orig .join "\n",map {
("
@@ -53,7 +51,4 @@ index 86ad3be..9e716db 100644
+ $mycompiler -c -fPIC -o slatec/$_\$(OBJ_EXT) $mycflags slatec/$_.f
" )} @slatecfiles;
- }
---
-1.8.3.1
-
+ };
diff --git a/PDL-2.7.0-Do-not-install-modules-using-PDL-Slatec-if-Slatec-is.patch b/PDL-2.7.0-Do-not-install-modules-using-PDL-Slatec-if-Slatec-is.patch
deleted file mode 100644
index 6e3fc20..0000000
--- a/PDL-2.7.0-Do-not-install-modules-using-PDL-Slatec-if-Slatec-is.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From ced0a183ab016d786db0f6a39edd7c000694d111 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar at redhat.com>
-Date: Wed, 26 Feb 2014 14:39:23 +0100
-Subject: [PATCH] Do not install modules using PDL::Slatec if Slatec is
- disabled
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-If Slatec support is disabled or detected as not available,
-PDL::Slatec modules will not be installed. Regardless the fact, other
-modules using PDL::Slatec get installed, despite of being unusable.
-
-This patch ommits such modules from installation if Slatec has been
-explicitly disabled.
-
-This does not cover the case when disabled by autodetection. This is
-because Slatec's Makefile.PL which does the detection is run after
-Makefile.PLs of affected reverse dependencies.
-
-Signed-off-by: Petr Písař <ppisar at redhat.com>
----
- Lib/Filter/Makefile.PL | 7 ++++++-
- Lib/Fit/Makefile.PL | 8 ++++++--
- Lib/Makefile.PL | 6 ++++++
- 3 files changed, 18 insertions(+), 3 deletions(-)
-
-diff --git a/Lib/Filter/Makefile.PL b/Lib/Filter/Makefile.PL
-index e9de58f..2cd6aa8 100644
---- a/Lib/Filter/Makefile.PL
-+++ b/Lib/Filter/Makefile.PL
-@@ -3,7 +3,12 @@ WriteMakefile(
- NAME => 'PDL::Filter',
- VERSION_FROM => '../../Basic/Core/Version.pm',
- PM => {
-- map {($_ => '$(INST_LIBDIR)/Filter/'.$_)} <*.pm>
-+ map {($_ => '$(INST_LIBDIR)/Filter/'.$_)}
-+ grep {
-+ !defined $PDL::Config{WITH_SLATEC} ||
-+ $PDL::Config{WITH_SLATEC}==1 ||
-+ !($_ eq 'LinPred.pm')
-+ } <*.pm>
- },
- (eval ($ExtUtils::MakeMaker::VERSION) >= 6.57_02 ? ('NO_MYMETA' => 1) : ()),
- );
-diff --git a/Lib/Fit/Makefile.PL b/Lib/Fit/Makefile.PL
-index a2e1273..73ded7b 100644
---- a/Lib/Fit/Makefile.PL
-+++ b/Lib/Fit/Makefile.PL
-@@ -1,11 +1,15 @@
- use ExtUtils::MakeMaker;
-
--
- WriteMakefile(
- 'NAME' => 'PDL::Fit',
- VERSION_FROM => '../../Basic/Core/Version.pm',
- DIR => [ qw/Gaussian/ ],
-- PM => { map {($_ => '$(INST_LIBDIR)/Fit/'.$_)} <*.pm> },
-+ PM => { map {($_ => '$(INST_LIBDIR)/Fit/'.$_)}
-+ grep {
-+ !defined $PDL::Config{WITH_SLATEC} ||
-+ $PDL::Config{WITH_SLATEC}==1 ||
-+ !($_ eq 'Linfit.pm' || $_ eq 'LM.pm')
-+ } <*.pm> },
- (eval ($ExtUtils::MakeMaker::VERSION) >= 6.57_02 ? ('NO_MYMETA' => 1) : ()),
- );
-
-diff --git a/Lib/Makefile.PL b/Lib/Makefile.PL
-index 115799f..a5b215f 100644
---- a/Lib/Makefile.PL
-+++ b/Lib/Makefile.PL
-@@ -9,6 +9,12 @@ WriteMakefile(
- DIR => [ qw/Opt ImageRGB Fit FFT Filter Image2D ImageND
- CallExt Slatec GSL GIS Transform Minuit Compression
- / ],
-+ PM => { map {($_ => '$(INST_LIBDIR)/'.$_)}
-+ grep {
-+ !defined $PDL::Config{WITH_SLATEC} ||
-+ $PDL::Config{WITH_SLATEC}==1 ||
-+ !($_ eq 'Gaussian.pm')
-+ } <*.pm> },
- (eval ($ExtUtils::MakeMaker::VERSION) >= 6.57_02 ? ('NO_MYMETA' => 1) : ()),
- # Interpolate
- );
---
-1.8.5.3
-
diff --git a/perl-PDL-2.4.7-hdf.patch b/perl-PDL-2.4.7-hdf.patch
deleted file mode 100644
index 2921ece..0000000
--- a/perl-PDL-2.4.7-hdf.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up PDL-2.4.7/IO/HDF/Makefile.PL.hdf PDL-2.4.7/IO/HDF/Makefile.PL
---- PDL-2.4.7/IO/HDF/Makefile.PL.hdf 2010-07-24 20:38:35.000000000 +0200
-+++ PDL-2.4.7/IO/HDF/Makefile.PL 2010-10-14 12:27:07.039237016 +0200
-@@ -28,6 +28,7 @@ BEGIN
- # default locations:
- @HDF_lib_locations = (
- '/usr/lib64',
-+ '/usr/lib64/hdf',
- '/usr/local/netcdf/lib',
- '/usr/local/lib',
- '/usr/local/lib64',
diff --git a/perl-PDL-2.8.0-hdf.patch b/perl-PDL-2.8.0-hdf.patch
new file mode 100644
index 0000000..3730c59
--- /dev/null
+++ b/perl-PDL-2.8.0-hdf.patch
@@ -0,0 +1,11 @@
+diff -up PDL-2.008/IO/HDF/Makefile.PL.orig PDL-2.008/IO/HDF/Makefile.PL
+--- PDL-2.008/IO/HDF/Makefile.PL.orig 2015-05-25 10:35:14.989454093 +0200
++++ PDL-2.008/IO/HDF/Makefile.PL 2015-05-25 10:35:40.598769649 +0200
+@@ -22,6 +22,7 @@ if (defined $PDL::Config{WITH_HDF} && $P
+ # default locations:
+ my @HDF_lib_locations = (
+ '/usr/lib64',
++ '/usr/lib64/hdf',
+ '/usr/local/netcdf/lib',
+ '/usr/local/lib',
+ '/usr/local/lib64',
diff --git a/perl-PDL.spec b/perl-PDL.spec
index 072d8fe..04333f1 100644
--- a/perl-PDL.spec
+++ b/perl-PDL.spec
@@ -9,9 +9,9 @@
%endif
Name: perl-PDL
-%global cpan_version 2.007
-Version: 2.7.0
-Release: 9%{?dist}
+%global cpan_version 2.008
+Version: 2.8.0
+Release: 1%{?dist}
Summary: The Perl Data Language
Group: Development/Libraries
License: GPL+ or Artistic
@@ -19,19 +19,13 @@ Url: http://pdl.perl.org/
Source0: http://search.cpan.org/CPAN/authors/id/C/CH/CHM/PDL-%{cpan_version}.tar.gz
# Uncomment to enable PDL::IO::Browser
# Patch0: perl-PDL-2.4.10-settings.patch
-Patch1: perl-PDL-2.4.7-hdf.patch
+Patch1: perl-PDL-2.8.0-hdf.patch
# Disable Proj support when it's not compatible, bug #839651
Patch2: PDL-2.4.10-Disable-PDL-GIS-Proj.patch
# Compile Slatec as PIC, needed for ARM
Patch3: PDL-2.6.0.90-Compile-Slatec-code-as-PIC.patch
# Disable Slatec code crashing on PPC64, bug #1041304
Patch4: PDL-2.7.0-Disable-PDL-Slatec.patch
-# Skip PDL::Slatec reverse dependencies if Slatec is disabled, bug #1041304,
-# https://sourceforge.net/p/pdl/bugs/350/
-Patch5: PDL-2.7.0-Do-not-install-modules-using-PDL-Slatec-if-Slatec-is.patch
-# Fix parallel build in Basic/Core directory,
-# https://sourceforge.net/p/pdl/bugs/370/
-Patch6: PDL-2.007-Basic-Core-Declare-dependecies-on-generated-header-f.patch
BuildRequires: fftw2-devel
BuildRequires: freeglut-devel
BuildRequires: gcc-gfortran
@@ -47,7 +41,7 @@ BuildRequires: perl
BuildRequires: perl(Config)
BuildRequires: perl(Cwd)
BuildRequires: perl(Data::Dumper) >= 2.121
-# Modified perl(Devel::CheckLib) bundled
+BuildRequires: perl(Devel::CheckLib)
BuildRequires: perl(Devel::REPL)
BuildRequires: perl(ExtUtils::F77)
BuildRequires: perl(ExtUtils::MakeMaker) >= 6.56
@@ -62,22 +56,26 @@ BuildRequires: perl(strict)
BuildRequires: perl(vars)
BuildRequires: perl(warnings)
# Run-time:
+BuildRequires: perl(autodie)
BuildRequires: perl(base)
BuildRequires: perl(constant)
BuildRequires: perl(Devel::REPL::Plugin)
BuildRequires: perl(DynaLoader)
BuildRequires: perl(English)
BuildRequires: perl(Exporter)
+BuildRequires: perl(ExtUtils::Manifest)
BuildRequires: perl(Fcntl)
BuildRequires: perl(fields)
BuildRequires: perl(File::Basename)
BuildRequires: perl(File::Copy)
BuildRequires: perl(FileHandle)
BuildRequires: perl(File::Map) >= 0.57
+BuildRequires: perl(File::Path)
BuildRequires: perl(File::Temp)
BuildRequires: perl(Filter::Simple) >= 0.88
BuildRequires: perl(Filter::Util::Call)
BuildRequires: perl(Inline) >= 0.43
+BuildRequires: perl(Inline::C)
BuildRequires: perl(List::MoreUtils)
BuildRequires: perl(List::Util)
BuildRequires: perl(Module::Compile) >= 0.23
@@ -94,7 +92,10 @@ BuildRequires: perl(Text::Balanced) >= 1.89
BuildRequires: perl(Benchmark)
BuildRequires: perl(ExtUtils::testlib)
BuildRequires: perl(IO::String)
+BuildRequires: perl(IPC::Cmd)
BuildRequires: perl(Test)
+BuildRequires: perl(Test::Deep)
+BuildRequires: perl(Test::Exception)
BuildRequires: perl(Test::More)
BuildRequires: perl(Test::Warn)
# Optional tests:
@@ -117,6 +118,12 @@ Requires: perl(Filter::Simple) >= 0.88
Requires: perl(Inline) >= 0.43
Requires: perl(Module::Compile) >= 0.23
Requires: perl(OpenGL) >= 0.6702
+Requires: perl(Prima::Application)
+Requires: perl(Prima::Buttons)
+Requires: perl(Prima::Edit)
+Requires: perl(Prima::Label)
+Requires: perl(Prima::PodView)
+Requires: perl(Prima::Utils)
Requires: perl(Text::Balanced) >= 1.89
Provides: perl(PDL::Config)
Provides: perl(PDL::PP::CType)
@@ -159,8 +166,6 @@ such commercial packages as IDL and MatLab.
%if %{without slatec}
%patch4 -p1 -b .slatec
%endif
-%patch5 -p1 -b .slatec_revdep
-%patch6 -p1
# Fix shebang
sed -e 's,^#!/usr/bin/env perl,#!/usr/bin/perl,' -i Perldl2/pdl2
@@ -199,6 +204,9 @@ make test
%{_mandir}/man3/*.3*
%changelog
+* Mon May 25 2015 Jitka Plesnikova <jplesnik at redhat.com> - 2.8.0-1
+- 2.008 bump
+
* Fri Apr 03 2015 Petr Pisar <ppisar at redhat.com> - 2.7.0-9
- Rebuild against proj-4.9
diff --git a/sources b/sources
index 53a4be3..70423ea 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ea343d3569ce02dbeadf1f58d700656f PDL-2.007.tar.gz
+c990b17ebbf5ef9f83a383130cace47c PDL-2.008.tar.gz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/perl-PDL.git/commit/?h=master&id=147e69e76f6e481b0fa2bc509b5f3d6e229a0854
More information about the scm-commits
mailing list