diff --git a/5.diff b/5.diff new file mode 100644 index 0000000..e7f8b67 --- /dev/null +++ b/5.diff @@ -0,0 +1,13 @@ +diff --git a/Unpack.pm b/Unpack.pm +index d5354ac..fb675e7 100644 +--- a/Unpack.pm ++++ b/Unpack.pm +@@ -1081,7 +1081,7 @@ sub unpack + + # die Dumper "_run_mime_helper: $archive, $new_name, $destdir", readlink($unpacked), $unpacked; + +- unless (ref $unpacked or -e $unpacked) ++ unless (ref $unpacked or -e $unpacked or readlink($unpacked)) + { + warn("archive=$archive, new_name=$new_name\n"); + die("assert -e '$unpacked'") diff --git a/perl-File-Unpack.changes b/perl-File-Unpack.changes index 4c98997..a6f1f85 100644 --- a/perl-File-Unpack.changes +++ b/perl-File-Unpack.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Mar 16 16:09:50 UTC 2017 - coolo@suse.com + +- add 5.diff from pull request of micha + ------------------------------------------------------------------- Tue Feb 21 18:37:08 UTC 2017 - coolo@suse.com diff --git a/perl-File-Unpack.spec b/perl-File-Unpack.spec index 27a6002..9c91d85 100644 --- a/perl-File-Unpack.spec +++ b/perl-File-Unpack.spec @@ -24,6 +24,7 @@ License: GPL-1.0+ or Artistic-1.0 Group: Development/Libraries/Perl Source: http://search.cpan.org/CPAN/authors/id/J/JN/JNW/File-Unpack-%{version}.tar.gz Patch0: fix-xml-test.diff +Patch1: 5.diff Url: http://github.com/jnweiger/perl-File-Unpack BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -95,20 +96,15 @@ Requires: xz Recommends: xz %endif -%if 0%{?suse_version} > 1230 +%if 0%{?suse_version} > 1320 BuildRequires: lzip Requires: lzip %else Recommends: lzip %endif -%if 0%{?suse_version} > 1010 -# SLES10 says: nothing provides poppler-tools BuildRequires: poppler-tools Requires: poppler-tools -%else -Recommends: poppler-tools -%endif ## The following BuildRequires is for testing existance only. ## If you cannot provide a package, you may remove it from both BuildRequires @@ -166,6 +162,7 @@ ships with the File::Unpack perl module. %prep %setup -q -n File-Unpack-%{version} %patch0 -p1 +%patch1 -p1 %build %{__perl} Makefile.PL INSTALLDIRS=vendor