fix META file generation by working around rt#85406

For release time, require an up to date EUMM.  For build time, don't
include extra metadata that trips the bug.

diff --git a/Makefile.PL b/Makefile.PL
index 6aba500..2ff04b9 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -22,17 +22,22 @@ WriteMakefile(
   },
   $mymeta_works ? (BUILD_REQUIRES => \%BUILD_DEPS) : (),
 
-  META_ADD => {
-    resources => {
-      # r/w: gitmo@git.shadowcat.co.uk:Role-Tiny.git
-      repository => 'git://git.shadowcat.co.uk/gitmo/Role-Tiny.git',
-    },
-  },
-
-  META_MERGE => {
+  -f 'META.yml' ? () : (META_MERGE => {
     'meta-spec' => { version => 2 },
     no_index => {
       directory => [ 'xt' ]
-    }
-  },
+    },
+    resources => {
+      # r/w: gitmo@git.shadowcat.co.uk:Role-Tiny.git
+      repository => {
+        url => 'git://git.shadowcat.co.uk/gitmo/Role-Tiny.git',
+        web => 'http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=gitmo/Role-Tiny.git',
+        type => 'git',
+      },
+      bugtracker => {
+          mailto => 'bug-Role-Tiny@rt.cpan.org',
+          web => 'https://rt.cpan.org/Public/Dist/Display.html?Name=Role-Tiny',
+      },
+    },
+  }),
 );

diff --git a/maint/Makefile.PL.include b/maint/Makefile.PL.include
index ab2f05c..f9ca77f 100644 (file)
--- a/maint/Makefile.PL.include
+++ b/maint/Makefile.PL.include
@@ -1,6 +1,7 @@
 BEGIN { -e 'Distar' or system("git clone git://git.shadowcat.co.uk/p5sagit/Distar.git") }
 use lib 'Distar/lib';
 use Distar;
+use ExtUtils::MakeMaker 5.68 ();
 
 author 'mst - Matt S. Trout (cpan:MSTROUT) <mst@shadowcat.co.uk>';