diff --git a/amanda-3.3.0-qw.patch b/amanda-3.3.0-qw.patch new file mode 100644 index 0000000..2eb0a84 --- /dev/null +++ b/amanda-3.3.0-qw.patch @@ -0,0 +1,106 @@ +Index: amanda/branches/3_3/perl/Amanda/Changer/robot.pm +=================================================================== +--- amanda/branches/3_3/perl/Amanda/Changer/robot.pm (revision 4171) ++++ amanda/branches/3_3/perl/Amanda/Changer/robot.pm (revision 4172) +@@ -266,7 +266,7 @@ + } + + # status-interval, eject-delay, unload-delay +- for my $propname qw(status-interval eject-delay unload-delay) { ++ for my $propname (qw(status-interval eject-delay unload-delay)) { + next unless exists $config->{'properties'}->{$propname}; + if (@{$config->{'properties'}->{$propname}->{'values'}} > 1) { + return Amanda::Changer->make_error("fatal", undef, +Index: amanda/branches/3_3/perl/Amanda/Recovery/Planner.pm +=================================================================== +--- amanda/branches/3_3/perl/Amanda/Recovery/Planner.pm (revision 4171) ++++ amanda/branches/3_3/perl/Amanda/Recovery/Planner.pm (revision 4172) +@@ -228,7 +228,7 @@ + my $self = shift; + my %params = @_; + +- for my $rq_param qw(changer plan_cb dumpspecs) { ++ for my $rq_param (qw(changer plan_cb dumpspecs)) { + croak "required parameter '$rq_param' mising" + unless exists $params{$rq_param}; + } +@@ -339,7 +339,7 @@ + my $self = shift; + my %params = @_; + +- for my $rq_param qw(holding_file plan_cb) { ++ for my $rq_param (qw(holding_file plan_cb)) { + croak "required parameter '$rq_param' mising" + unless exists $params{$rq_param}; + } +@@ -390,7 +390,7 @@ + my $self = shift; + my %params = @_; + +- for my $rq_param qw(filelist plan_cb) { ++ for my $rq_param (qw(filelist plan_cb)) { + croak "required parameter '$rq_param' mising" + unless exists $params{$rq_param}; + } +Index: amanda/branches/3_3/perl/Amanda/Recovery/Clerk.pm +=================================================================== +--- amanda/branches/3_3/perl/Amanda/Recovery/Clerk.pm (revision 4171) ++++ amanda/branches/3_3/perl/Amanda/Recovery/Clerk.pm (revision 4172) +@@ -228,7 +228,7 @@ + my $self = shift; + my %params = @_; + +- for my $rq_param qw(dump xfer_src_cb) { ++ for my $rq_param (qw(dump xfer_src_cb)) { + croak "required parameter '$rq_param' missing" + unless exists $params{$rq_param}; + } +@@ -262,7 +262,7 @@ + my %params = @_; + + $self->dbg("starting recovery"); +- for my $rq_param qw(xfer recovery_cb) { ++ for my $rq_param (qw(xfer recovery_cb)) { + croak "required parameter '$rq_param' missing" + unless exists $params{$rq_param}; + } +Index: amanda/branches/3_3/perl/Amanda/Taper/Scribe.pm +=================================================================== +--- amanda/branches/3_3/perl/Amanda/Taper/Scribe.pm (revision 4171) ++++ amanda/branches/3_3/perl/Amanda/Taper/Scribe.pm (revision 4172) +@@ -442,7 +442,7 @@ + my %params = @_; + + my $decide_debug = $Amanda::Config::debug_taper || $params{'debug'}; +- for my $rq_param qw(taperscan feedback) { ++ for my $rq_param (qw(taperscan feedback)) { + croak "required parameter '$rq_param' mising" + unless exists $params{$rq_param}; + } +@@ -491,7 +491,7 @@ + my $self = shift; + my %params = @_; + +- for my $rq_param qw(write_timestamp finished_cb) { ++ for my $rq_param (qw(write_timestamp finished_cb)) { + croak "required parameter '$rq_param' missing" + unless exists $params{$rq_param}; + } +@@ -615,7 +615,7 @@ + my $self = shift; + my %params = @_; + +- for my $rq_param qw(max_memory) { ++ for my $rq_param (qw(max_memory)) { + croak "required parameter '$rq_param' missing" + unless exists $params{$rq_param}; + } +@@ -1622,7 +1622,7 @@ + my $self = shift; + my %params = @_; + +- for my $rq_param qw(finished_cb) { ++ for my $rq_param (qw(finished_cb)) { + croak "required parameter '$rq_param' mising" + unless exists $params{$rq_param}; + } diff --git a/amanda.spec b/amanda.spec index f124cbd..935eb62 100644 --- a/amanda.spec +++ b/amanda.spec @@ -8,7 +8,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.3.0 -Release: 2%{?dist} +Release: 3%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -17,6 +17,7 @@ Source8: amandahosts Patch2: amanda-3.1.1-xattrs.patch Patch3: amanda-3.1.1-tcpport.patch Patch6: amanda-3.2.0-config-dir.patch +Patch7: amanda-3.3.0-qw.patch License: BSD and GPLv3+ and GPLv2+ and GPLv2 Group: Applications/System URL: http://www.amanda.org @@ -80,6 +81,7 @@ server also needs to have the amanda-client package installed. %patch2 -p1 -b .xattrs %patch3 -p1 -b .tcpport %patch6 -p1 -b .config +%patch7 -p3 -b .qw ./autogen %build @@ -429,6 +431,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* Mon Nov 28 2011 Lukáš Nykrýn - 3.3.0-3 +- fix #757618 - Use of qw(...) as parentheses is deprecated + * Thu Jun 16 2011 Marcela Mašláňová - 3.3.0-2 - Perl mass rebuild