From 953378fc059798292c1e87c6dcda76748fdd57db Mon Sep 17 00:00:00 2001
From: Jitka Plesnikova <jples...@redhat.com>
Date: Mon, 6 Jun 2016 12:55:07 +0200
Subject: 2.016 bump
---
.gitignore | 1 +
perl-PDL-gsl.patch | 39 ---------------------------------------
perl-PDL.spec | 23 ++++++++++++-----------
sources | 2 +-
4 files changed, 14 insertions(+), 51 deletions(-)
delete mode 100644 perl-PDL-gsl.patch
diff --git a/.gitignore b/.gitignore
index e7f1de5..ea6fbf7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ PDL-2.4.6.tar.gz
/PDL-2.013.tar.gz
/PDL-2.014.tar.gz
/PDL-2.015.tar.gz
+/PDL-2.016.tar.gz
diff --git a/perl-PDL-gsl.patch b/perl-PDL-gsl.patch
deleted file mode 100644
index 93869e1..0000000
--- a/perl-PDL-gsl.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -up PDL-2.015/Lib/GSL/SF/ellint/gsl_sf_ellint.pd.gsl
PDL-2.015/Lib/GSL/SF/ellint/gsl_sf_ellint.pd
---- PDL-2.015/Lib/GSL/SF/ellint/gsl_sf_ellint.pd.gsl 2015-08-11
19:44:20.000000000 -0600
-+++ PDL-2.015/Lib/GSL/SF/ellint/gsl_sf_ellint.pd 2015-11-30
15:50:16.162825309 -0700
-@@ -82,6 +82,10 @@ $e() = r.err;
- Doc =>'Legendre form of incomplete elliptic integrals P(phi,k,n) =
Integral[(1 + n Sin[t]^2)^(-1)/Sqrt[1 - k^2 Sin[t]^2], {t, 0, phi}]'
- );
-
-+my $v = `gsl-config --version`;
-+
-+if($v < 2.0) {
-+
- pp_def('gsl_sf_ellint_D',
- GenericTypes => [D],
- Pars=>'double phi(); double k(); double n();
-@@ -95,6 +99,24 @@ $e() = r.err;
- Doc =>'Legendre form of incomplete elliptic integrals D(phi,k,n)'
- );
-
-+}
-+else {
-+
-+pp_def('gsl_sf_ellint_D',
-+ GenericTypes => [D],
-+ Pars=>'double phi(); double k();
-+ double [o]y(); double [o]e()',
-+ Code =>'
-+gsl_sf_result r;
-+GSLERR(gsl_sf_ellint_D_e,($phi(),$k(),GSL_PREC_DOUBLE,&r))
-+$y() = r.val;
-+$e() = r.err;
-+',
-+ Doc =>'Legendre form of incomplete elliptic integrals D(phi,k)'
-+ );
-+
-+}
-+
- pp_def('gsl_sf_ellint_RC',
- GenericTypes => [D],
- Pars=>'double x(); double yy(); double [o]y(); double [o]e()',
diff --git a/perl-PDL.spec b/perl-PDL.spec
index 668c709..7ed6eb0 100644
--- a/perl-PDL.spec
+++ b/perl-PDL.spec
@@ -9,9 +9,9 @@
%endif
Name: perl-PDL
-%global cpan_version 2.015
-Version: 2.15.0
-Release: 4%{?dist}
+%global cpan_version 2.016
+Version: 2.16.0
+Release: 1%{?dist}
Summary: The Perl Data Language
Group: Development/Libraries
License: GPL+ or Artistic
@@ -26,9 +26,6 @@ Patch2: PDL-2.4.10-Disable-PDL-GIS-Proj.patch
Patch3: PDL-2.6.0.90-Compile-Slatec-code-as-PIC.patch
# Disable Slatec code crashing on PPC64, bug #1041304
Patch4: PDL-2.14.0-Disable-PDL-Slatec.patch
-# GSL 2 support
-# https://sourceforge.net/p/pdl/bugs/407/
-Patch5: perl-PDL-gsl.patch
BuildRequires: coreutils
BuildRequires: fftw2-devel
BuildRequires: findutils
@@ -41,6 +38,8 @@ BuildRequires: libXi-devel
BuildRequires: libXmu-devel
BuildRequires: make
BuildRequires: perl
+BuildRequires: perl-devel
+BuildRequires: perl-generators
# perl(Astro::FITS::Header) not packaged yet
# Modified perl(Carp) bundled
# Modified perl(Carp::Heavy) bundled
@@ -143,7 +142,7 @@ 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::GL)
Provides: perl(PDL::Graphics::TriD::Contours)
Provides: perl(PDL::Graphics::TriD::Image)
Provides: perl(PDL::Graphics::TriD::Objects)
@@ -175,7 +174,6 @@ such commercial packages as IDL and MatLab.
%if %{without slatec}
%patch4 -p1 -b .slatec
%endif
-%patch5 -p1 -b .gsl
# Fix shellbang
sed -e 's,^#!/usr/bin/env perl,%(perl -MConfig -e 'print
$Config{startperl}'),' -i Perldl2/pdl2
@@ -195,8 +193,8 @@ make pure_install DESTDIR=%{buildroot}
perl -Mblib Doc/scantree.pl %{buildroot}%{perl_vendorarch}
perl -pi -e "s|%{buildroot}/|/|g" %{buildroot}%{perl_vendorarch}/PDL/pdldoc.db
find %{buildroot}%{perl_vendorarch} -type f -name "*.pm" | xargs chmod -x
-find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
-find %{buildroot} -type f -name '*.bs' -empty -exec rm -f {} ';'
+find %{buildroot} -type f -name .packlist -delete
+find %{buildroot} -type f -name '*.bs' -empty -delete
chmod -R u+w %{buildroot}/*
%check
@@ -214,6 +212,9 @@ make test
%{_mandir}/man3/*.3*
%changelog
+* Mon Jun 06 2016 Jitka Plesnikova <jples...@redhat.com> - 2.16.0-1
+- 2.016 bump
+
* Mon Feb 22 2016 Orion Poplawski <or...@cora.nwra.com> - 2.15.0-4
- Rebuild for gsl 2.1
@@ -460,7 +461,7 @@ make test
- rebuild
* Fri Mar 10 2006 Jason Vas Dias <jvd...@redhat.com> - 2.4.2-4
-- Further code cleanup & CFLAGS settings required to enable tests
+- Further code cleanup & CFLAGS settings required to enable tests
to succeed on all platforms
* Thu Mar 09 2006 Jason Vas Dias <jvd...@redhat.com> - 2.4.2-4
diff --git a/sources b/sources
index 0650abb..2c99d4d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fe2da41811efce2fdf874c64842c6a43 PDL-2.015.tar.gz
+ffb55fe4520354b3cf77b01ab6416dd4 PDL-2.016.tar.gz
--
cgit v0.12
http://pkgs.fedoraproject.org/cgit/perl-PDL.git/commit/?h=f24&id=953378fc059798292c1e87c6dcda76748fdd57db
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
perl-devel mailing list
perl-devel@lists.fedoraproject.org
https://lists.fedoraproject.org/admin/lists/perl-devel@lists.fedoraproject.org
