From d652dcddbc758d6a1d68f3df3fe9a9119d93ec3d Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Jul 30 2017 11:14:40 +0000 Subject: Perl no longer contains cwd in INC. Signed-off-by: Peter Lemenkov --- diff --git a/pspp-0003-perl-added-current-directory-path-to-calls.patch b/pspp-0003-perl-added-current-directory-path-to-calls.patch new file mode 100644 index 0000000..ad85da6 --- /dev/null +++ b/pspp-0003-perl-added-current-directory-path-to-calls.patch @@ -0,0 +1,63 @@ +From: Friedrich Beckmann +Date: Mon, 10 Oct 2016 12:55:01 +0200 +Subject: [PATCH] perl - added current directory path to calls + +The perl INC path in debian does not include the current directory +anymore. Therefore I added the current directory path at the places +where a module is called and it is assumed that . is part of INC. + +See: https://lwn.net/Articles/698853/ + +diff --git a/perl-module/Makefile.PL b/perl-module/Makefile.PL +index a315abbe..7efaa57b 100644 +--- a/perl-module/Makefile.PL ++++ b/perl-module/Makefile.PL +@@ -4,7 +4,7 @@ use ExtUtils::MakeMaker; + # the contents of the Makefile that is written. + + +-do 'pspp-module-config' || do { ++do './pspp-module-config' || do { + my $build = prompt ("Enter the location of the build directory of the configured pspp source:", "" ); + my $src = $top_srcdir; + +diff --git a/tests/data/data-in.at b/tests/data/data-in.at +index cfe965c5..0c3a1837 100644 +--- a/tests/data/data-in.at ++++ b/tests/data/data-in.at +@@ -25,7 +25,7 @@ EOF + #! /usr/bin/perl + use strict; + use warnings; +-do 'my-rand.pl'; ++do './my-rand.pl'; + my_rand (1) foreach 1...10000; + our $seed; + die $seed if $seed != 1043618065; +@@ -39,7 +39,7 @@ date_in () { + use strict; + use warnings; + +-do 'my-rand.pl'; ++do './my-rand.pl'; + + my ($fmt_name, @templates) = @ARGV; + +@@ -198,7 +198,7 @@ time_in () { + use strict; + use warnings; + +-do 'my-rand.pl'; ++do './my-rand.pl'; + + my ($skip, $fmt_name, @templates) = @ARGV; + +@@ -287,7 +287,7 @@ use POSIX; + use strict; + use warnings; + +-do 'my-rand.pl'; ++do './my-rand.pl'; + + for my $number (0, 1, .5, .015625, 123) { + my ($base_exp) = floor ($number ? log10 ($number) : 0); diff --git a/pspp.spec b/pspp.spec index 44c1f58..06eaee0 100644 --- a/pspp.spec +++ b/pspp.spec @@ -1,6 +1,6 @@ Name: pspp Version: 0.10.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A program for statistical analysis of sampled data Group: Applications/Engineering License: GPLv3+ @@ -11,6 +11,7 @@ Source1: https://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz.sig Source2: pspp-Smake Patch1: pspp-0001-sys-file-reader-Avoid-null-dereference-skipping-bad-.patch Patch2: pspp-0002-sys-file-reader-Fix-integer-overflows-in-parse_long_.patch +Patch3: pspp-0003-perl-added-current-directory-path-to-calls.patch BuildRequires: plotutils-devel, ncurses-devel, readline-devel BuildRequires: gsl-devel >= 1.11-2 BuildRequires: postgresql-devel @@ -123,6 +124,9 @@ fi %changelog +* Sun Jul 30 2017 Peter Lemenkov - 0.10.2-6 +- Perl no longer contains cwd in INC. + * Fri Jul 28 2017 Peter Lemenkov - 0.10.2-5 - Fix FTBFS with recent GCC - Build using system-wide Gnulib