8
0

- add 5.diff from pull request of micha

OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/perl-File-Unpack?expand=0&rev=85
This commit is contained in:
Stephan Kulow
2017-03-16 16:10:05 +00:00
committed by Git OBS Bridge
parent 0a061756f5
commit 21abc383c3
3 changed files with 21 additions and 6 deletions

13
5.diff Normal file
View File

@@ -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'")

View File

@@ -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 Tue Feb 21 18:37:08 UTC 2017 - coolo@suse.com

View File

@@ -24,6 +24,7 @@ License: GPL-1.0+ or Artistic-1.0
Group: Development/Libraries/Perl Group: Development/Libraries/Perl
Source: http://search.cpan.org/CPAN/authors/id/J/JN/JNW/File-Unpack-%{version}.tar.gz Source: http://search.cpan.org/CPAN/authors/id/J/JN/JNW/File-Unpack-%{version}.tar.gz
Patch0: fix-xml-test.diff Patch0: fix-xml-test.diff
Patch1: 5.diff
Url: http://github.com/jnweiger/perl-File-Unpack Url: http://github.com/jnweiger/perl-File-Unpack
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -95,20 +96,15 @@ Requires: xz
Recommends: xz Recommends: xz
%endif %endif
%if 0%{?suse_version} > 1230 %if 0%{?suse_version} > 1320
BuildRequires: lzip BuildRequires: lzip
Requires: lzip Requires: lzip
%else %else
Recommends: lzip Recommends: lzip
%endif %endif
%if 0%{?suse_version} > 1010
# SLES10 says: nothing provides poppler-tools
BuildRequires: poppler-tools BuildRequires: poppler-tools
Requires: poppler-tools Requires: poppler-tools
%else
Recommends: poppler-tools
%endif
## The following BuildRequires is for testing existance only. ## The following BuildRequires is for testing existance only.
## If you cannot provide a package, you may remove it from both BuildRequires ## 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 %prep
%setup -q -n File-Unpack-%{version} %setup -q -n File-Unpack-%{version}
%patch0 -p1 %patch0 -p1
%patch1 -p1
%build %build
%{__perl} Makefile.PL INSTALLDIRS=vendor %{__perl} Makefile.PL INSTALLDIRS=vendor