[packages/perl-PDL] - up to 2.4.11

Tue Jun 11 11:43:10 CEST 2013

commit 929221558a56fe8119fa046ddc7456a9fa8ac4a9
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Tue Jun 11 11:43:03 2013 +0200

    - up to 2.4.11

 PDL-Disable-PDL-GIS-Proj.patch | 30 ++++++++++++++++++++++++++++++
 perl-PDL.spec                  | 30 ++++++++++++------------------
 2 files changed, 42 insertions(+), 18 deletions(-)
---

diff --git a/perl-PDL.spec b/perl-PDL.spec
index 334f5d1..0947840 100644
--- a/perl-PDL.spec
+++ b/perl-PDL.spec
@@ -11,19 +11,20 @@ Summary:	perlDL - efficient numerical computing for Perl
 Summary(pl.UTF-8):	perlDL - wydajne obliczenia numeryczne w Perlu
 Summary(pt_BR.UTF-8):	Módulo PDL para perl
 Name:		perl-PDL
-Version:	2.4.9
-Release:	4
+Version:	2.4.11
+Release:	1
 Epoch:		1
 # same as perl
 License:	GPL v1+ or Artistic
 Group:		Development/Languages/Perl
 Source0:	http://dl.sourceforge.net/pdl/%{pdir}-%{version}.tar.gz
-# Source0-md5:	459e127d3ad7d80a95d6006373b1da6c
+# Source0-md5:	761a524f6f823ecc2dc668b83ecd8299
 Patch0:		%{name}-conf.patch
 Patch1:		%{name}-dep.patch
 Patch2:		%{name}-Makefile.PL.patch-dumb
 Patch3:		%{name}-fftw-shared.patch
-Patch5:		%{name}-vendorarch.patch
+Patch4:		%{name}-vendorarch.patch
+Patch5:		PDL-Disable-PDL-GIS-Proj.patch
 URL:		http://pdl.perl.org/
 BuildRequires:	fftw-devel >= 2.1.3-5
 BuildRequires:	gd-devel
@@ -45,7 +46,7 @@ BuildRequires:	xorg-lib-libXext-devel
 BuildRequires:	xorg-lib-libXt-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define 	_noautoreqdep	libGL.so.1 libGLU.so.1 libGLcore.so.1
+%define		_noautoreqdep	libGL.so.1 libGLU.so.1 libGLcore.so.1
 %define		_noautoreq	'perl(local.perldlrc)' 'perl(PDL::Graphics::TriD::GObject)'
 
 %description
@@ -462,6 +463,7 @@ Przykładowe skrypty z użyciem PDL.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 %patch5 -p1
 
 %{__perl} -pi -e 's/\b(pdlpp_postamble)\b/$1_int/g' Graphics/PLplot/Makefile.PL
@@ -472,6 +474,8 @@ Przykładowe skrypty z użyciem PDL.
 %{__perl} -pi -e "s@(OPENGL_LIBS.*)'-L/usr/lib@\$1'-L/usr/%{_lib}@" perldl.conf
 %{__perl} -pi -e "s@(WHERE_PLPLOT_LIBS.*)undef@\$1'/usr/%{_lib}'@" perldl.conf
 
+ln -s Basic PDL
+
 %build
 %{__perl} Makefile.PL \
 	INSTALLDIRS=vendor
@@ -502,8 +506,6 @@ mv -f PDL::Polynomial.3pm	PDL::Fit::Polynomial.3pm
 mv -f PDL::State.3pm		PDL::Graphics::State.3pm
 mv -f Pdlpp.3pm			Inline::Pdlpp.3pm
 
-echo '.so PDL.3' >$RPM_BUILD_ROOT%{_mandir}/man1/pdl.1
-
 # some man pages do not belong to the man1 section
 cd $RPM_BUILD_ROOT%{_mandir}/man1
 for i in PDL::*.1*; do
@@ -781,6 +783,9 @@ fi
 %{perl_vendorarch}/PDL/Math.pm
 %{perl_vendorarch}/PDL/MatrixOps.pm
 %{perl_vendorarch}/PDL/NiceSlice.pm
+%dir %{perl_vendorarch}/PDL/NiceSlice
+%{perl_vendorarch}/PDL/NiceSlice/FilterSimple.pm
+%{perl_vendorarch}/PDL/NiceSlice/FilterUtilCall.pm
 %{perl_vendorarch}/PDL/Opt
 %{perl_vendorarch}/PDL/Ops.pm
 %{perl_vendorarch}/PDL/Options.pm
@@ -862,7 +867,6 @@ fi
 %{perl_vendorarch}/Inline/MakePdlppInstallable.pm
 %{perl_vendorarch}/Inline/Pdlpp.pm
 
-%{_mandir}/man1/pdl.1*
 %{_mandir}/man1/pptemplate.1*
 %{_mandir}/man3/Inline::Pdlpp.3pm*
 %{_mandir}/man3/PDL.*
@@ -1086,21 +1090,11 @@ fi
 
 %files Transform
 %defattr(644,root,root,755)
-%dir %{perl_vendorarch}/PDL/GIS
-%{perl_vendorarch}/PDL/GIS/Proj.pm
 %{perl_vendorarch}/PDL/Transform.pm
 %{perl_vendorarch}/PDL/Transform
-%dir %{perl_vendorarch}/auto/PDL/GIS
-%dir %{perl_vendorarch}/auto/PDL/GIS/Proj
-%{perl_vendorarch}/auto/PDL/GIS/Proj/*.bs
-%attr(755,root,root) %{perl_vendorarch}/auto/PDL/GIS/Proj/*.so
 %dir %{perl_vendorarch}/auto/PDL/Transform
 %{perl_vendorarch}/auto/PDL/Transform/*.bs
 %attr(755,root,root) %{perl_vendorarch}/auto/PDL/Transform/*.so
-%dir %{perl_vendorarch}/auto/PDL/Transform/Proj4
-%{perl_vendorarch}/auto/PDL/Transform/Proj4/*.bs
-%attr(755,root,root) %{perl_vendorarch}/auto/PDL/Transform/Proj4/*.so
-%{_mandir}/man3/PDL::GIS::*
 
 %files Demos
 %defattr(644,root,root,755)
diff --git a/PDL-Disable-PDL-GIS-Proj.patch b/PDL-Disable-PDL-GIS-Proj.patch
new file mode 100644
index 0000000..8ab5056
--- /dev/null
+++ b/PDL-Disable-PDL-GIS-Proj.patch
@@ -0,0 +1,30 @@
+From 97c73a81b7ad606f4089b4788ec58a51ccf77714 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar at redhat.com>
+Date: Tue, 4 Sep 2012 14:20:30 +0200
+Subject: [PATCH] Disable PDL::GIS::Proj
+
+The proj-4.8.0 stopped providing access to list of projections. We
+cannot support it anymore.
+
+<http://sourceforge.net/tracker/index.php?func=detail&aid=3515759&group_id=612&atid=100612>
+<https://bugzilla.redhat.com/show_bug.cgi?id=839651>
+---
+ perldl.conf | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/perldl.conf b/perldl.conf
+index 18e9de0..a11e8f0 100755
+--- a/perldl.conf
++++ b/perldl.conf
+@@ -203,7 +203,7 @@
+ # false -> don't use
+ # true -> force use
+ #
+-        WITH_PROJ => undef,    # Leave it up to PDL to decide
++        WITH_PROJ => 0,        # Leave it up to PDL to decide
+         PROJ_LIBS => undef,
+         PROJ_INC => undef,
+ 
+-- 
+1.7.11.4
+
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/perl-PDL.git/commitdiff/929221558a56fe8119fa046ddc7456a9fa8ac4a9

