From 21e052646905bc5c54c3d142c2e5cb5c25cff35a Mon Sep 17 00:00:00 2001
From: Petr Písař <ppisar@redhat.com>
Date: Jul 12 2017 09:23:26 +0000
Subject: Fix t/eu_command.t test


---

diff --git a/ExtUtils-MakeMaker-7.25_01-Correct-the-order-of-tests-of-chmod-.-294.patch b/ExtUtils-MakeMaker-7.25_01-Correct-the-order-of-tests-of-chmod-.-294.patch
new file mode 100644
index 0000000..f0c365d
--- /dev/null
+++ b/ExtUtils-MakeMaker-7.25_01-Correct-the-order-of-tests-of-chmod-.-294.patch
@@ -0,0 +1,53 @@
+From 58fa199a752913dfb0455ac1397e897afcc1f9b4 Mon Sep 17 00:00:00 2001
+From: James E Keenan <jkeenan@cpan.org>
+Date: Thu, 11 May 2017 04:23:40 -0400
+Subject: [PATCH] Correct the order of tests of chmod(). (#294)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Per code review by haarg, the order of tests was wrong in the first place.
+Hence, correctly re-ordering them is a better repair than changing one test's
+description.
+
+For: https://github.com/Perl-Toolchain-Gang/ExtUtils-MakeMaker/pull/294
+Signed-off-by: Petr Písař <ppisar@redhat.com>
+---
+ t/eu_command.t | 13 +++++++------
+ 1 file changed, 7 insertions(+), 6 deletions(-)
+
+diff --git a/t/eu_command.t b/t/eu_command.t
+index 269aa5c..32a6f59 100644
+--- a/t/eu_command.t
++++ b/t/eu_command.t
+@@ -151,20 +151,21 @@ BEGIN {
+         is( ((stat('testdir'))[2] & 07777) & 0700,
+             0100, 'change a dir to execute-only' );
+ 
+-        # change a dir to read-only
+-        @ARGV = ( '0400', 'testdir' );
++        # change a dir to write-only
++        @ARGV = ( '0200', 'testdir' );
+         ExtUtils::Command::chmod();
+ 
+         is( ((stat('testdir'))[2] & 07777) & 0700,
+-            0400, 'change a dir to read-only' );
++            0200, 'change a dir to write-only' );
+ 
+-        # change a dir to write-only
+-        @ARGV = ( '0200', 'testdir' );
++        # change a dir to read-only
++        @ARGV = ( '0400', 'testdir' );
+         ExtUtils::Command::chmod();
+ 
+         is( ((stat('testdir'))[2] & 07777) & 0700,
+-            0200, 'change a dir to write-only' );
++            0400, 'change a dir to read-only' );
+ 
++        # remove the dir we've been playing with
+         @ARGV = ('testdir');
+         rm_rf;
+         ok( ! -e 'testdir', 'rm_rf can delete a read-only dir' );
+-- 
+2.9.4
+
diff --git a/perl-ExtUtils-MakeMaker.spec b/perl-ExtUtils-MakeMaker.spec
index ade3086..304e525 100644
--- a/perl-ExtUtils-MakeMaker.spec
+++ b/perl-ExtUtils-MakeMaker.spec
@@ -2,7 +2,7 @@
 
 Name:           perl-%{cpan_name}
 Version:        7.24
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Create a module Makefile
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -19,6 +19,8 @@ Patch2:         %{cpan_name}-7.04-Unbundle-version.patch
 Patch3:         %{cpan_name}-7.22-Unbundle-Encode-Locale.patch
 # Provide maybe_command independently, bug #1129443
 Patch4:         %{cpan_name}-7.11-Provide-ExtUtils-MM-methods-as-standalone-ExtUtils-M.patch
+# Fix t/eu_command.t test, in upstream 2.25_02
+Patch5:         %{cpan_name}-7.25_01-Correct-the-order-of-tests-of-chmod-.-294.patch
 BuildArch:      noarch
 BuildRequires:  coreutils
 BuildRequires:  findutils
@@ -162,6 +164,7 @@ is an overkill for small subroutines.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 # Remove bundled modules
 rm -rf bundled
 sed -i -e '/^bundled\// d' MANIFEST
@@ -208,6 +211,9 @@ make test
 %{_mandir}/man3/ExtUtils::MM::Utils.*
 
 %changelog
+* Wed Jul 12 2017 Petr Pisar <ppisar@redhat.com> - 7.24-2
+- Fix t/eu_command.t test
+
 * Thu Aug 25 2016 Jitka Plesnikova <jplesnik@redhat.com> - 7.24-1
 - 7.24 bump