summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlav Vitters <olav@vitters.nl>2020-04-22 13:37:21 +0200
committerOlav Vitters <olav@vitters.nl>2020-04-22 13:37:21 +0200
commit9a5056a80e75c5a09f7e50d038d20462e5bafb3e (patch)
tree5f2e3c62ab67839e6db2e152ba8436926cd50d90
parent6c86432bebb88131a00f240a2b4f43eea851db5d (diff)
downloadmgagnome-9a5056a80e75c5a09f7e50d038d20462e5bafb3e.tar
mgagnome-9a5056a80e75c5a09f7e50d038d20462e5bafb3e.tar.gz
mgagnome-9a5056a80e75c5a09f7e50d038d20462e5bafb3e.tar.bz2
mgagnome-9a5056a80e75c5a09f7e50d038d20462e5bafb3e.tar.xz
mgagnome-9a5056a80e75c5a09f7e50d038d20462e5bafb3e.zip
convert %make to %make_build
-rwxr-xr-xmgagnome3
1 files changed, 3 insertions, 0 deletions
diff --git a/mgagnome b/mgagnome
index 0b5e791..eee5a60 100755
--- a/mgagnome
+++ b/mgagnome
@@ -371,6 +371,7 @@ class SpecFile(object):
('keep library matching using two lines', 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), True),
('change find_lang --with-help into --with-gnome', '\g<keeppre> --with-gnome\g<keeppost>', re.compile(r'^(?P<keeppre>\s*\%find_lang[^\\\n]+) --with-help(?P<keeppost>[^\\\n]*\n)', re.MULTILINE + re.IGNORECASE)),
('change find_lang remove duplicate with_gnome', None, re.compile(r'^(?P<keeppre>\%find_lang[^\\\n]+ --with-gnome) --with-gnome(?P<keeppost>[^\\\n]*\n)', re.MULTILINE + re.IGNORECASE)),
# Use new Python macros
@@ -1649,6 +1650,8 @@ def cmd_clean_spec_multi(args):
subprocess.call(cmd, cwd=os.path.expanduser(os.path.join(Downstream.PKGROOT, package)))
else:
# show the diff and undo all changes
+ if s.should_rebuild:
+ print("NOTICE: Package should be rebuilt")
print(s.changes)
s.ensure_no_local_changes(force=True)