ppisar pushed to perl-PDL (master). "Rebase Disable-PDL-Slatec patch"

[notifications at fedoraproject.org]

From b66bdcdc6ad28da1269dc8455eadfd22c887a450 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar at redhat.com>
Date: Tue, 27 Oct 2015 08:20:25 +0100
Subject: Rebase Disable-PDL-Slatec patch

---
 PDL-2.14.0-Disable-PDL-Slatec.patch | 31 +++++++++++++++++++++++++++++++
 PDL-2.7.0-Disable-PDL-Slatec.patch  | 31 -------------------------------
 perl-PDL.spec                       |  7 +++++--
 3 files changed, 36 insertions(+), 33 deletions(-)
 create mode 100644 PDL-2.14.0-Disable-PDL-Slatec.patch
 delete mode 100644 PDL-2.7.0-Disable-PDL-Slatec.patch

diff --git a/PDL-2.14.0-Disable-PDL-Slatec.patch b/PDL-2.14.0-Disable-PDL-Slatec.patch
new file mode 100644
index 0000000..c2c3da8
--- /dev/null
+++ b/PDL-2.14.0-Disable-PDL-Slatec.patch
@@ -0,0 +1,31 @@
+From 973ed492a3e36edc858b27ba114d32d6dfdb5b23 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar at redhat.com>
+Date: Tue, 27 Oct 2015 08:16:51 +0100
+Subject: [PATCH] Disable PDL::Slatec
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+<https://bugzilla.redhat.com/show_bug.cgi?id=1041304>
+
+Signed-off-by: Petr Písař <ppisar at redhat.com>
+---
+ perldl.conf | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/perldl.conf b/perldl.conf
+index a9ffc36..3129a09 100644
+--- a/perldl.conf
++++ b/perldl.conf
+@@ -127,7 +127,7 @@
+ # false -> don't use
+ # true -> force use
+ 
+-        WITH_SLATEC => undef,  # Leave it up to PDL to decide
++        WITH_SLATEC => 0,  # Crashes on PPC64
+ 
+ # Whether or not to build the PDL::Minuit module
+ # false -> don't use
+-- 
+2.4.3
+
diff --git a/PDL-2.7.0-Disable-PDL-Slatec.patch b/PDL-2.7.0-Disable-PDL-Slatec.patch
deleted file mode 100644
index 145c89c..0000000
--- a/PDL-2.7.0-Disable-PDL-Slatec.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From b7ba4415d0fa729d63632a7427e3db05a1808741 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar at redhat.com>
-Date: Mon, 16 Dec 2013 16:24:50 +0100
-Subject: [PATCH] Disable PDL::Slatec
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-<https://bugzilla.redhat.com/show_bug.cgi?id=1041304>
-
-Signed-off-by: Petr Písař <ppisar at redhat.com>
----
- perldl.conf | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/perldl.conf b/perldl.conf
-index f8a0d55..7f0ec7c 100755
---- a/perldl.conf
-+++ b/perldl.conf
-@@ -141,7 +141,7 @@
- # false -> don't use
- # true -> force use
- 
--        WITH_SLATEC => undef,  # Leave it up to PDL to decide
-+        WITH_SLATEC => 0,  # Crashes on PPC64
-         
- # Whether or not to build the PDL::Minuit module
- # false -> don't use
--- 
-1.8.3.1
-
diff --git a/perl-PDL.spec b/perl-PDL.spec
index fd72ecc..785f061 100644
--- a/perl-PDL.spec
+++ b/perl-PDL.spec
@@ -11,7 +11,7 @@
 Name:           perl-PDL
 %global cpan_version 2.014
 Version:        2.14.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        The Perl Data Language
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -25,7 +25,7 @@ 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
+Patch4:         PDL-2.14.0-Disable-PDL-Slatec.patch
 BuildRequires:  coreutils
 BuildRequires:  fftw2-devel
 BuildRequires:  findutils
@@ -209,6 +209,9 @@ make test
 %{_mandir}/man3/*.3*
 
 %changelog
+* Tue Oct 27 2015 Petr Pisar <ppisar at redhat.com> - 2.14.0-2
+- Rebase Disable-PDL-Slatec patch
+
 * Tue Oct 13 2015 Jitka Plesnikova <jplesnik at redhat.com> - 2.14.0-1
 - 2.014 bump
 
-- 
cgit v0.11.2


	http://pkgs.fedoraproject.org/cgit/perl-PDL.git/commit/?h=master&id=b66bdcdc6ad28da1269dc8455eadfd22c887a450