diff --git a/git-srpmimport b/git-srpmimport index b538b13..d0767a7 100755 --- a/git-srpmimport +++ b/git-srpmimport @@ -240,13 +240,14 @@ import() verbose "Processing $srpm" srpm="$(readlink -ev "$srpm")" - local header name version buildtime filelist author f + local header name version buildtime filelist changelog author message f header="$(od -A n -N 8 -t x1 -- "$srpm")" && [ -n "$header" -a -z "${header## ed ab ee db ?? ?? 00 01}" ] && name="$(rpmquery -p --qf '%{NAME}' -- "$srpm")" && version="$(rpmquery -p --qf '%{VERSION}-%{RELEASE}' -- "$srpm")" && buildtime="$(rpmquery -p --qf '%{BUILDTIME}' -- "$srpm")" && - filelist="$(rpm2cpio "$srpm" |cpio --list --quiet )" || + filelist="$(rpm2cpio "$srpm" |cpio --list --quiet )" && + changelog="$(rpmquery -p --qf '%{CHANGELOGTEXT}' -- "$srpm")" || fatal "$srpm: Not a valid source rpm package" author="$(rpmquery -p --qf '%{CHANGELOGNAME}\n' -- "$srpm" | @@ -315,8 +316,9 @@ import() optimize_rules "$gear_rules" + message=`printf '%s\n\n%s' "$version" "$changelog"` TZ=UTC faketime -d "1970-01-01 $buildtime seconds" -- \ - git-commit -a -m "$version" ${author:+--author "$author"} + git-commit -a -m "$message" ${author:+--author "$author"} verbose "Committed $name $version" TZ=UTC faketime -d "1970-01-01 $buildtime seconds" -- \ git-tag -a -m "$name $version" "$version"