bz 543660 apply patch from rt cpan 54827

This commit is contained in:
Marcela Mašláňová 2012-03-19 13:19:44 +01:00
parent a3c4b730e1
commit df8dee553d
2 changed files with 27 additions and 1 deletions

View File

@ -0,0 +1,20 @@
diff -up Archive-Zip-1.30/lib/Archive/Zip/Member.pm.bug Archive-Zip-1.30/lib/Archive/Zip/Member.pm
--- Archive-Zip-1.30/lib/Archive/Zip/Member.pm.bug 2009-06-30 13:51:10.000000000 +0200
+++ Archive-Zip-1.30/lib/Archive/Zip/Member.pm 2012-03-19 13:13:11.028294275 +0100
@@ -159,13 +159,13 @@ sub bitFlag {
# Set General Purpose Bit Flags according to the desiredCompressionLevel setting
if ( $self->desiredCompressionLevel == 1 || $self->desiredCompressionLevel == 2 ) {
- $self->{'bitFlag'} = DEFLATING_COMPRESSION_FAST;
+ $self->{'bitFlag'} |= DEFLATING_COMPRESSION_FAST;
} elsif ( $self->desiredCompressionLevel == 3 || $self->desiredCompressionLevel == 4
|| $self->desiredCompressionLevel == 5 || $self->desiredCompressionLevel == 6
|| $self->desiredCompressionLevel == 7 ) {
- $self->{'bitFlag'} = DEFLATING_COMPRESSION_NORMAL;
+ $self->{'bitFlag'} |= DEFLATING_COMPRESSION_NORMAL;
} elsif ( $self->desiredCompressionLevel == 8 || $self->desiredCompressionLevel == 9 ) {
- $self->{'bitFlag'} = DEFLATING_COMPRESSION_MAXIMUM;
+ $self->{'bitFlag'} |= DEFLATING_COMPRESSION_MAXIMUM;
}
$self->{'bitFlag'};
}

View File

@ -1,6 +1,6 @@
Name: perl-Archive-Zip Name: perl-Archive-Zip
Version: 1.30 Version: 1.30
Release: 7%{?dist} Release: 8%{?dist}
Summary: Perl library for accessing Zip archives Summary: Perl library for accessing Zip archives
Group: Development/Libraries Group: Development/Libraries
@ -9,6 +9,8 @@ URL: http://search.cpan.org/dist/Archive-Zip/
Source0: http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/Archive-Zip-%{version}.tar.gz Source0: http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/Archive-Zip-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch BuildArch: noarch
#https://rt.cpan.org/Public/Bug/Display.html?id=54827
Patch0: Archive-Zip-cpan-rt-54827.patch
BuildRequires: perl(Compress::Zlib) >= 1.14 BuildRequires: perl(Compress::Zlib) >= 1.14
BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(ExtUtils::MakeMaker)
@ -33,6 +35,7 @@ existing Zip files, or from existing directories, files, or strings.
%prep %prep
%setup -q -n Archive-Zip-%{version} %setup -q -n Archive-Zip-%{version}
%patch0 -p1
%{__perl} -pi -e 's|^#!/bin/perl|#!%{__perl}|' examples/*.pl %{__perl} -pi -e 's|^#!/bin/perl|#!%{__perl}|' examples/*.pl
%{__perl} -pi -e 's|^#!/usr/local/bin/perl|#!%{__perl}|' examples/selfex.pl %{__perl} -pi -e 's|^#!/usr/local/bin/perl|#!%{__perl}|' examples/selfex.pl
@ -67,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Mon Mar 19 2012 Marcela Mašláňová <mmaslano@redhat.com> - 1.30-8
- 543660 apply patch from rt cpan 54827
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.30-7 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.30-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild