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

delete generated rpm "changelog"
Upstream-commit: 8d0de1fa8d27473c2d3ecbb2af0ae06891337590
Component: engine

components/engine/.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

components/engine/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