diff --git a/scripts/mkspec-wrapper.sh b/scripts/mkspec-wrapper.sh index 4b0b4630..87fb9dfe 100644 --- a/scripts/mkspec-wrapper.sh +++ b/scripts/mkspec-wrapper.sh @@ -10,7 +10,7 @@ append() { local var=$1 shift - local tmp=`eval echo \\$$var $@ | sed 's/^[[:space:]]*//; s/[[:space:]]*$//'` + local tmp=`eval echo \"\\$$var $@\" | sed 's/^[[:space:]]*//; s/[[:space:]]*$//'` eval $var=\"$tmp\" } diff --git a/scripts/projects.py b/scripts/projects.py index 0492fa54..9242c694 100644 --- a/scripts/projects.py +++ b/scripts/projects.py @@ -374,6 +374,7 @@ def read_value(path, section, key): r.append(line) else: r = re.findall('^ *' + key + ' *= *(.*)', line) + #debug("key " + key + ": parsed line >" + line + "<, result is " + ' '.join(r)) if (len(r) > 0): break file.close() @@ -518,7 +519,7 @@ def pkg_relations(rel_type, args_): for i, item in enumerate(dep): dep[i] = item.strip() if s == 'jw' and len(dep) == 3: - dep_project = re.sub(r'-devel$|-run$', '', dep[0]) + dep_project = re.sub(r'-devel$|-dev$|-run$', '', dep[0]) if args.dont_expand_version_macros and dep_project in args.module: version = dep[2] else: