Skip to content

E
etersoft-build-utils
Commit 66798bdc authored by Vitaly Lipatov's avatar Vitaly Lipatov
Browse files
Options

rpmgs: fix get source url again

parent 733c9bb6
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
bin/rpmgs
View file @ 66798bdc
...@@ -128,8 +128,9 @@ function source_ext() ...@@ -128,8 +128,9 @@ function source_ext()
# Fake replace for correct subst variables # Fake replace for correct subst variables
NEWSOURCE="$(echo "$NEWSOURCE" | sed -e 's|\&|\\&|g')" NEWSOURCE="$(echo "$NEWSOURCE" | sed -e 's|\&|\\&|g')"
# TODO: use special field before %build # TODO: use special field before %build
#cat $1 | sed -e "s|^Summary:.*||g" | sed -e "s|^\(\%description.*\)|Summary: $NEWSOURCE\n\1|g" > $TMPSPEC #cat $1 | sed -e "s|^Summary:.*||" | sed -e "s|^\(# $SN-$2:.*\)|Summary: $NEWSOURCE\n\1|" > $TMPSPEC
cat $1 | sed -e "s|^Summary:.*||" | sed -e "s|^# $SN-$2:.*|Summary: $NEWSOURCE|" > $TMPSPEC # TODO: replace only first entry
cat $1 | sed -e "s|^Summary:.*|Summary: $NEWSOURCE|" > $TMPSPEC
GETSOURCEEXT=$(eval_spec "$TMPSPEC" | get_var "Summary") GETSOURCEEXT=$(eval_spec "$TMPSPEC" | get_var "Summary")
#rhas "$GETSOURCEEXT" "%" && fatal "some macro unexpanded in URL. Check $TMPSPEC" #rhas "$GETSOURCEEXT" "%" && fatal "some macro unexpanded in URL. Check $TMPSPEC"
rm -f "$TMPSPEC" rm -f "$TMPSPEC"
...@@ -472,7 +473,7 @@ do ...@@ -472,7 +473,7 @@ do
done done
[ -n "$DOWNLOADSOME" ] || fatal "No upstream code is updated for nev version $GSSETVERSION." [ -n "$DOWNLOADSOME" ] || fatal "No upstream code is updated for new version $GSSETVERSION."
if [ -z "$GSSKIPADDCHANGELOG" ] ; then if [ -z "$GSSKIPADDCHANGELOG" ] ; then
# Write changelog if all done # Write changelog if all done
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment