Merge pull request #32204 from thaJeztah/remove-generated-changelog

delete generated rpm "changelog"
This commit is contained in:
Victor Vieux 2017-03-29 11:47:20 -07:00 committed by GitHub
commit 8d0de1fa8d
2 changed files with 2 additions and 0 deletions

1
.gitignore vendored
View file

@ -16,6 +16,7 @@ autogen/
bundles/
cmd/dockerd/dockerd
cmd/docker/docker
contrib/builder/rpm/*/changelog
dockerversion/version_autogen.go
dockerversion/version_autogen_unix.go
docs/AWS_S3_BUCKET

View file

@ -54,6 +54,7 @@ set -e
make manpages
# Convert the CHANGELOG.md file into RPM changelog format
rm -f contrib/builder/rpm/${PACKAGE_ARCH}/changelog
VERSION_REGEX="^\W\W (.*) \((.*)\)$"
ENTRY_REGEX="^[-+*] (.*)$"
while read -r line || [[ -n "$line" ]]; do