diff --git a/bash-4.3-perl522.patch b/bash-4.3-perl522.patch new file mode 100644 index 00000000..6024e338 --- /dev/null +++ b/bash-4.3-perl522.patch @@ -0,0 +1,28 @@ +From: coolo@suse.com + +perl 5.22 makes the long deprecated defined(@array) an hard +error + +--- support/texi2html ++++ support/texi2html +@@ -4855,9 +4855,9 @@ sub update_sec_num { + my $ret; + + $level--; # here we start at 0 +- if ($name =~ /^appendix/ || defined(@appendix_sec_num)) { ++ if ($name =~ /^appendix/ || @appendix_sec_num) { + # appendix style +- if (defined(@appendix_sec_num)) { ++ if (@appendix_sec_num) { + &incr_sec_num($level, @appendix_sec_num); + } else { + @appendix_sec_num = ('A', 0, 0, 0); +@@ -4865,7 +4865,7 @@ sub update_sec_num { + $ret = join('.', @appendix_sec_num[0..$level]); + } else { + # normal style +- if (defined(@normal_sec_num)) ++ if (@normal_sec_num) + { + &incr_sec_num($level, @normal_sec_num); + } diff --git a/bash.changes b/bash.changes index ec4b5bb9..4eeff1c9 100644 --- a/bash.changes +++ b/bash.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jul 1 08:31:09 UTC 2015 - coolo@suse.com + +- add bash-4.3-perl522.patch to fix texi2html for perl 5.22 + (defined(@array) has been deprecated since at least 2012) + ------------------------------------------------------------------- Thu May 28 08:50:30 UTC 2015 - werner@suse.de diff --git a/bash.spec b/bash.spec index 24d5e82a..0b4083b7 100644 --- a/bash.spec +++ b/bash.spec @@ -1,7 +1,7 @@ # # spec file for package bash # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -96,6 +96,7 @@ Patch30: readline-6.3-destdir.patch Patch31: readline-6.3-rltrace.patch Patch40: bash-4.1-bash.bashrc.dif Patch46: man2html-no-timestamp.patch +Patch47: bash-4.3-perl522.patch # PATCH-FIX-SUSE Patch48: bash-4.3-extra-import-func.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -314,6 +315,7 @@ done %patch31 -p0 -b .tmp %patch40 -p0 -b .bashrc %patch46 -p0 -b .notimestamp +%patch47 -p0 -b .perl522 %if %{with import_function} %patch48 %endif