[perl-Archive-Zip] 1.39 bump

Wed Oct 22 11:31:38 UTC 2014

commit 0cba5d48c607df915d93b8c4d47f2ba5d36761ee
Author: Jitka Plesnikova <jplesnik at redhat.com>
Date:   Wed Oct 22 13:31:33 2014 +0200

    1.39 bump

 .gitignore                      |    1 +
 Archive-Zip-cpan-rt-54827.patch |   25 ++++++++++++++-----------
 perl-Archive-Zip.spec           |   25 ++++++++++---------------
 sources                         |    2 +-
 4 files changed, 26 insertions(+), 27 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index d352068..9b4dff6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ Archive-Zip-1.30.tar.gz
 /Archive-Zip-1.36.tar.gz
 /Archive-Zip-1.37.tar.gz
 /Archive-Zip-1.38.tar.gz
+/Archive-Zip-1.39.tar.gz
diff --git a/Archive-Zip-cpan-rt-54827.patch b/Archive-Zip-cpan-rt-54827.patch
index e22477d..3ecb815 100644
--- a/Archive-Zip-cpan-rt-54827.patch
+++ b/Archive-Zip-cpan-rt-54827.patch
@@ -1,18 +1,21 @@
-diff -up Archive-Zip-1.33/lib/Archive/Zip/Member.pm.orig Archive-Zip-1.33/lib/Archive/Zip/Member.pm
---- Archive-Zip-1.33/lib/Archive/Zip/Member.pm.orig	2013-11-10 04:47:27.000000000 +0100
-+++ Archive-Zip-1.33/lib/Archive/Zip/Member.pm	2013-11-22 12:48:19.848476120 +0100
-@@ -167,13 +167,13 @@ sub bitFlag {
- 
-     # Set General Purpose Bit Flags according to the desiredCompressionLevel setting
-     if ( $self->desiredCompressionLevel == 1 || $self->desiredCompressionLevel == 2 ) {
+diff -up Archive-Zip-1.39/lib/Archive/Zip/Member.pm.orig Archive-Zip-1.39/lib/Archive/Zip/Member.pm
+--- Archive-Zip-1.39/lib/Archive/Zip/Member.pm.orig	2014-10-22 13:05:47.852592106 +0200
++++ Archive-Zip-1.39/lib/Archive/Zip/Member.pm	2014-10-22 13:10:28.151696108 +0200
+@@ -159,16 +159,16 @@ 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 ) {
+     } 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 ) {
+     } elsif ($self->desiredCompressionLevel == 8
+         || $self->desiredCompressionLevel == 9) {
 -        $self->{'bitFlag'} = DEFLATING_COMPRESSION_MAXIMUM;
 +        $self->{'bitFlag'} |= DEFLATING_COMPRESSION_MAXIMUM;
      }
diff --git a/perl-Archive-Zip.spec b/perl-Archive-Zip.spec
index a53ba2d..fb946e2 100644
--- a/perl-Archive-Zip.spec
+++ b/perl-Archive-Zip.spec
@@ -1,5 +1,5 @@
 Name:           perl-Archive-Zip
-Version:        1.38
+Version:        1.39
 Release:        1%{?dist}
 Summary:        Perl library for accessing Zip archives
 
@@ -7,7 +7,6 @@ Group:          Development/Libraries
 License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/Archive-Zip/
 Source0:        http://search.cpan.org/CPAN/authors/id/P/PH/PHRED/Archive-Zip-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 #https://rt.cpan.org/Public/Bug/Display.html?id=54827
 Patch0:         Archive-Zip-cpan-rt-54827.patch
@@ -19,9 +18,9 @@ BuildRequires:  perl(strict)
 # Run-time
 BuildRequires:  perl(bytes)
 BuildRequires:  perl(Carp)
+BuildRequires:  perl(Compress::Raw::Zlib)
 BuildRequires:  perl(constant)
 BuildRequires:  perl(Cwd)
-BuildRequires:  perl(Compress::Raw::Zlib)
 BuildRequires:  perl(Encode)
 BuildRequires:  perl(Exporter)
 BuildRequires:  perl(File::Basename)
@@ -45,7 +44,7 @@ BuildRequires:  perl(warnings)
 BuildRequires:  unzip
 BuildRequires:  zip
 
-Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:  perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 
 %description
 The Archive::Zip module allows a Perl program to create, manipulate,
@@ -62,20 +61,18 @@ existing Zip files, or from existing directories, files, or strings.
 %prep
 %setup -q -n Archive-Zip-%{version}
 %patch0 -p1
-%{__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|^#!/bin/perl|#!%{__perl}|' examples/*.pl
+perl -pi -e 's|^#!/usr/local/bin/perl|#!%{__perl}|' examples/selfex.pl
 
 
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor
+perl Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
+make pure_install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
-find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null ';'
 %{_fixperms} $RPM_BUILD_ROOT/*
 
 
@@ -83,12 +80,7 @@ find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null ';'
 make test
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %files
-%defattr(-,root,root,-)
 %doc Changes examples/
 %{_bindir}/crc32
 %{perl_vendorlib}/Archive/
@@ -96,6 +88,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Oct 22 2014 Jitka Plesnikova <jplesnik at redhat.com> - 1.39-1
+- 1.39 bump
+
 * Wed Sep 10 2014 Jitka Plesnikova <jplesnik at redhat.com> - 1.38-1
 - 1.38 bump
 
diff --git a/sources b/sources
index 770bac3..440d758 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-51cece4b0e0167cd187daa26fa962705  Archive-Zip-1.38.tar.gz
+851316e59625317a89e40418a26c676c  Archive-Zip-1.39.tar.gz
