summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlav Vitters <olav@vitters.nl>2015-09-11 18:51:42 +0200
committerOlav Vitters <olav@vitters.nl>2015-09-11 18:51:42 +0200
commite6b6fb739ac178c4b4c72bfb2c08a660ffce24b3 (patch)
treeafd2c005060dabbef5938f0dad74aa5370b2819d
parentf462d1a27bccd74da5f588a6bfbcd8a35c9f435f (diff)
downloadmgagnome-e6b6fb739ac178c4b4c72bfb2c08a660ffce24b3.tar
mgagnome-e6b6fb739ac178c4b4c72bfb2c08a660ffce24b3.tar.gz
mgagnome-e6b6fb739ac178c4b4c72bfb2c08a660ffce24b3.tar.bz2
mgagnome-e6b6fb739ac178c4b4c72bfb2c08a660ffce24b3.tar.xz
mgagnome-e6b6fb739ac178c4b4c72bfb2c08a660ffce24b3.zip
match more unneeded setup options
-rwxr-xr-xmgagnome2
1 files changed, 1 insertions, 1 deletions
diff --git a/mgagnome b/mgagnome
index 2ca47c5..d7d2b27 100755
--- a/mgagnome
+++ b/mgagnome
@@ -351,7 +351,7 @@ class SpecFile(object):
('remove cleaning buildroot in install', None, re.compile(r'(?P<keeppre>^\%install(?:[ \t]+[^\n]*)?\n)' + re_rm_buildroot + r'\n?', re.MULTILINE + re.IGNORECASE)),
('remove clean section', None, re.compile(r'^\%clean[ \t]*\n(?:' + re_rm_buildroot + r')?\s*(?P<keeppost>(?:^#[^%\n]+\n)*^(?:\%files|\%post|\%pre|\%trigger|\%install|\%package|\%check|\%_font_pkg|$(?!.|\n)))', re.MULTILINE + re.IGNORECASE)),
('remove buildroot definition', None, re.compile(r'^BuildRoot[ \t]*:[^\n]+\n', re.MULTILINE + re.IGNORECASE)),
- ('remove unneeded setup option', None, re.compile(r'^(?P<keeppre>\%setup -q )-n (?:\%name|\%\{name\})-(?:\%version|\%\{version\})(?P<keeppost>\n)', re.MULTILINE + re.IGNORECASE)),
+ ('remove unneeded setup option', None, re.compile(r'^(?P<keeppre>\%setup -q)(?: -n|n) (?:\%name|\%\{name\})-(?:\%version|\%\{version\})(?P<keeppost>\n)', re.MULTILINE + re.IGNORECASE)),
('https for download.gnome.org', r'\g<keeppre>https://\g<keeppost>', re.compile(r'^(?P<keeppre>Source[0-9]*[ \t]*:[^\n]+)http://(?P<keeppost>download.gnome.org/[^\n]+\n)', re.MULTILINE + re.IGNORECASE)),
('download.gnome.org instead of ftp.gnome.org', r'\g<keeppre>https://download.gnome.org\g<keeppost>', re.compile(r'^(?P<keeppre>Source[0-9]*[ \t]*:[^\n]+)(?:ftp|http|https)://ftp.gnome.org/pub/GNOME(?P<keeppost>/[^\n]+\n)', re.MULTILINE + re.IGNORECASE)),
('restrict what libraries are matched with major numbers', r'\g<keeppre>{,.*}', re.compile(r'^(?P<keeppre>%{_libdir}[^\n]+})\.?\*$', re.MULTILINE)),