diff --git a/.gitignore b/.gitignore index 218339eccd..3e5ed1f82b 100644 --- a/.gitignore +++ b/.gitignore @@ -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 diff --git a/hack/make/build-rpm b/hack/make/build-rpm index eeda82ee61..db0bcf1c17 100644 --- a/hack/make/build-rpm +++ b/hack/make/build-rpm @@ -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