diff --git a/.gitignore b/.gitignore index 2c0f1a4..408a60b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /stow-2.2.0.tar.gz +/stow-2.2.2.tar.bz2 diff --git a/avoid-precedence-warning.patch b/avoid-precedence-warning.patch deleted file mode 100644 index 2ea76d0..0000000 --- a/avoid-precedence-warning.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- 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/sources b/sources index 9b2280e..9734a56 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -902564d502975f353d3b0514a21863b1 stow-2.2.0.tar.gz +af1e1de9d973c835bee80c745b5ee849 stow-2.2.2.tar.bz2 diff --git a/stow.spec b/stow.spec index 1c913f3..430994d 100644 --- a/stow.spec +++ b/stow.spec @@ -1,16 +1,12 @@ Name: stow -Version: 2.2.0 -Release: 9%{?dist} +Version: 2.2.2 +Release: 1%{?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 +Source: http://ftp.gnu.org/gnu/stow/stow-%{version}.tar.bz2 BuildArch: noarch # Test dependencies @@ -18,6 +14,10 @@ BuildArch: noarch BuildRequires: perl(Data::Dumper) BuildRequires: perl(Test::More) BuildRequires: perl(Test::Output) +BuildRequires: perl(IO::Scalar) +BuildRequires: perl(Carp) +BuildRequires: perl(IO::File) +BuildRequires: perl(Module::Build) Requires(preun): /sbin/install-info Requires(post): /sbin/install-info @@ -45,7 +45,6 @@ This package contains the documentation for GNU Stow. %prep %setup -q -%patch0 -p 1 %build %configure --docdir=%{moredocs} @@ -75,9 +74,10 @@ fi %files %defattr(-,root,root) -%doc COPYING README AUTHORS ChangeLog NEWS THANKS TODO +%doc README AUTHORS ChangeLog NEWS THANKS TODO %doc %{_mandir}/man8/stow* %doc %{_infodir}/stow* +%license COPYING %{_bindir}/* %{_datadir}/perl5/Stow.pm %{_datadir}/perl5/Stow/ @@ -91,6 +91,11 @@ fi %changelog +* Tue Nov 10 2015 Robin Lee - 2.2.2-1 +- Update to 2.2.2 +- BR: perl(IO::Scalar), perl(Carp), perl(IO::File), perl(Module::Build) +- Drop upstreamed avoid-precedence-warning.patch + * Wed Oct 28 2015 Robin Lee - 2.2.0-9 - Fix Perl 5.20 warning (BZ#1226473)