expand some of the clean-spec regular expressions to make these easier to read

1 files changed, 21 insertions, 4 deletions

diff --git a/mgagnome b/mgagnome
index 4881333..0759b9f 100755
--- a/mgagnome
+++ b/mgagnome
@@ -505,7 +505,7 @@ class SpecFile():
                 'metacpan.org instead of www.cpan.org and search.cpan.org',
                 r'\g<keeppre>https://cpan.metacpan.org/\g<keepmore>\g<keeppost>',
                 re.compile(r'^(?P<keeppre>Source[0-9]*[ \t]*:[^\n]+)'
-                           r'https?://(?:(?:www\.cpan\.org)(?:/CPAN)?|(?:(?i)search\.cpan\.org)/CPAN)/+'
+                           r'https?://(?:(?:www\.cpan\.org)(?:/CPAN)?|(?:search\.cpan\.org)/CPAN)/+'
                            r'(?P<keepmore>authors/id/|modules/by-module/|modules/by-authors/id/)'
                            r'(?P<keeppost>[^\n]+\n)',
                            re.MULTILINE + re.IGNORECASE)
@@ -520,9 +520,26 @@ class SpecFile():
                 r'\g<keeppre>\n\g<keeppre>.*',
                 re.compile(r'^(?P<keeppre>%{_libdir}[^\n]+})$\n(?P=keeppre)\{,\.\*\}$', re.MULTILINE)
             ),
-            ('make use of autopatch', r'%autopatch -p1', re.compile(r'^%apply_patches$', re.MULTILINE)),
-            ('change configure2_5x macro to configure', r'%configure', re.compile(r'^%configure2_5x\b', re.MULTILINE)),
-            ('change make macro to make_build', r'%make_build', re.compile(r'^%make\b', re.MULTILINE)),
+            (
+                'make use of autopatch',
+                r'%autopatch -p1',
+                re.compile(r'^%apply_patches$', re.MULTILINE)
+            ),
+            (
+                'change configure2_5x macro to configure',
+                r'%configure',
+                re.compile(r'^%configure2_5x\b', re.MULTILINE)
+            ),
+            (
+                'change make macro to make_build',
+                r'%make_build',
+                re.compile(r'^%make\b', re.MULTILINE)
+            ),
+            (
+                'make_build already implies V=1 and VERBOSE=1, remove these',
+                r'%make_build',
+                re.compile(r'^%make_build(?:[ \t]+(?:V=1|VERBOSE=1))+\b', re.MULTILINE)
+            ),
             (
                 'change find_lang --with-help into --with-gnome',
                 r'\g<keeppre> --with-gnome\g<keeppost>',