From 11fe1b9713fcb4b25059dca626dc5e81770194d6 Mon Sep 17 00:00:00 2001 From: Robin Lee Date: Oct 28 2015 17:29:29 +0000 Subject: Fix Perl 5.20 warning (BZ#1226473) --- diff --git a/avoid-precedence-warning.patch b/avoid-precedence-warning.patch new file mode 100644 index 0000000..2ea76d0 --- /dev/null +++ b/avoid-precedence-warning.patch @@ -0,0 +1,13 @@ +--- stow-2.2.0/lib/Stow.pm.in.orig 2012-02-18 21:33:34.000000000 +0100 ++++ stow-2.2.0/lib/Stow.pm.in 2015-05-30 00:43:26.676356876 +0200 +@@ -1732,8 +1732,8 @@ + } + elsif (-l $path) { + debug(4, " read_a_link($path): real link"); +- return readlink $path +- or error("Could not read link: $path"); ++ my $target = readlink $path or error("Could not read link: $path"); ++ return $target; + } + internal_error("read_a_link() passed a non link path: $path\n"); + } diff --git a/stow.spec b/stow.spec index 88987a2..1c913f3 100644 --- a/stow.spec +++ b/stow.spec @@ -1,12 +1,16 @@ Name: stow Version: 2.2.0 -Release: 8%{?dist} +Release: 9%{?dist} License: GPLv2+ Group: Development/Tools URL: http://www.gnu.org/software/stow/stow.html Summary: Manage the installation of software packages from source Source: http://ftp.gnu.org/gnu/stow/stow-%{version}.tar.gz +# https://bugzilla.redhat.com/show_bug.cgi?id=1226473 +# applied in upstream git d788ce0c1c59b3158270143659f7a4363da73056 +# This 2.2.0-rebased version is the attachemnt in BZ#1226473 (fixed EOL) +Patch0: avoid-precedence-warning.patch BuildArch: noarch # Test dependencies @@ -41,6 +45,7 @@ This package contains the documentation for GNU Stow. %prep %setup -q +%patch0 -p 1 %build %configure --docdir=%{moredocs} @@ -86,6 +91,9 @@ fi %changelog +* Wed Oct 28 2015 Robin Lee - 2.2.0-9 +- Fix Perl 5.20 warning (BZ#1226473) + * Fri Jun 19 2015 Fedora Release Engineering - 2.2.0-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild