- rediffed non-deterministic-failures patch, updated macros

diff --git a/perl-rpm-build-perl-non-deterministic-failures.patch b/perl-rpm-build-perl-non-deterministic-failures.patch
index 21aa35e9a545699601777a5cee8bcc53bf73df3c..feb30c37bb77138fccf34c48817a97b7791792b5 100644 (file)
--- a/perl-rpm-build-perl-non-deterministic-failures.patch
+++ b/perl-rpm-build-perl-non-deterministic-failures.patch
@@ -21,7 +21,7 @@ diff --git a/lib/B/Walker.pm b/lib/B/Walker.pm
 index b71f204..f626043 100644
 --- a/lib/B/Walker.pm
 +++ b/lib/B/Walker.pm
 index b71f204..f626043 100644
 --- a/lib/B/Walker.pm
 +++ b/lib/B/Walker.pm

-@@ -119,7 +119,7 @@ sub walk_gv ($) {
+@@ -126,7 +126,7 @@ sub walk_gv ($) {

  sub walk_stash ($$);
  sub walk_stash ($$) { # similar to B::walksymtable
        my ($symref, $prefix) = @_;
  sub walk_stash ($$);
  sub walk_stash ($$) { # similar to B::walksymtable
        my ($symref, $prefix) = @_;


@@ -30,6 +30,3 @@ index b71f204..f626043 100644
                no strict 'refs';
                my $fullname = "*main::". $prefix . $sym;
                if ($sym =~ /::\z/) {
                no strict 'refs';
                my $fullname = "*main::". $prefix . $sym;
                if ($sym =~ /::\z/) {

--- 
-1.7.10.4
-

diff --git a/perl-rpm-build-perl.spec b/perl-rpm-build-perl.spec
index 8645b1e5d0817804ac23a5d919ef314ad08be96c..d14ccba46905ddaa103e98e1aa94ccf251d52c20 100644 (file)
--- a/perl-rpm-build-perl.spec
+++ b/perl-rpm-build-perl.spec
@@ -21,6 +21,7 @@ Patch2:               rpm-build-perl-0.82-Port-to-OpSIBLING-like-macros-required-since-Perl-5
 URL:           http://search.cpan.org/dist/rpm-build-perl/
 BuildRequires: perl-devel >= 1:5.8.0
 BuildRequires: rpm-perlprov >= 4.1-13
 URL:           http://search.cpan.org/dist/rpm-build-perl/
 BuildRequires: perl-devel >= 1:5.8.0
 BuildRequires: rpm-perlprov >= 4.1-13

+BuildRequires: rpmbuild(macros) >= 1.745

 %if %{with tests}
 BuildRequires: perl-Encode
 BuildRequires: perl-Test-Simple
 %if %{with tests}
 BuildRequires: perl-Encode
 BuildRequires: perl-Test-Simple