[perl-PDL] Disable Proj support

[Petr Pisar]

commit ea375cef9b468e72a6c5fd65b3514cb2fad958d0
Author: Petr Písař <ppisar at redhat.com>
Date:   Tue Sep 4 14:43:16 2012 +0200

    Disable Proj support

 PDL-2.4.10-Disable-PDL-GIS-Proj.patch |   30 ++++++++++++++++++++++++++++++
 perl-PDL.spec                         |   13 ++++++++++---
 2 files changed, 40 insertions(+), 3 deletions(-)
---
diff --git a/PDL-2.4.10-Disable-PDL-GIS-Proj.patch b/PDL-2.4.10-Disable-PDL-GIS-Proj.patch
new file mode 100644
index 0000000..8ab5056
--- /dev/null
+++ b/PDL-2.4.10-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
+
diff --git a/perl-PDL.spec b/perl-PDL.spec
index 3b4c304..a7915b7 100644
--- a/perl-PDL.spec
+++ b/perl-PDL.spec
@@ -1,6 +1,6 @@
 Name:           perl-PDL
 Version:        2.4.10
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        The Perl Data Language
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -9,6 +9,8 @@ Source0:        http://search.cpan.org/CPAN/authors/id/C/CH/CHM/PDL-%{version}.t
 # Uncomment to enable PDL::IO::Browser
 # Patch0:         perl-PDL-2.4.10-settings.patch
 Patch1:         perl-PDL-2.4.7-hdf.patch
+# Disable Proj support because it's not compatible anymore, bug #839651
+Patch2:         PDL-2.4.10-Disable-PDL-GIS-Proj.patch
 BuildRequires:  perl(version)
 BuildRequires:  perl(ExtUtils::F77)
 BuildRequires:  perl(File::Spec)
@@ -24,8 +26,9 @@ BuildRequires:  gd-devel
 BuildRequires:  gsl-devel
 BuildRequires:  hdf-static hdf-devel
 BuildRequires:  freeglut-devel libXmu-devel libXi-devel
-BuildRequires:  proj-devel
-BuildRequires:  proj-nad
+# Needed by PDL::GIS::Proj, currently disabled
+# BuildRequires:  proj-devel
+# BuildRequires:  proj-nad
 # Need by PDL::IO::Browser, currently disabled
 # BuildRequires:  ncurses-devel
 BuildRequires:  sharutils
@@ -54,6 +57,7 @@ such commercial packages as IDL and MatLab.
 # Uncomment to enable PDL::IO::Browser
 # %patch0 -p1 -b .settings
 %patch1 -p1 -b .hdf
+%patch2 -p1 -b .proj
 
 %build
 CFLAGS="%{optflags} -Wno-unused"
@@ -90,6 +94,9 @@ make test
 %{_mandir}/man3/*.3*
 
 %changelog
+* Tue Sep 04 2012 Petr Pisar <ppisar at redhat.com> - 2.4.10-4
+- Disable Proj support (bug #839651)
+
 * Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.10-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild