From 70d85a659ea8de57bab0c0d2e265c3526d4c7268 Mon Sep 17 00:00:00 2001 From: Matt Davis Date: Wed, 30 May 2018 16:47:48 -0700 Subject: [PATCH] fix RPM builds with placeholder CHANGELOG * fails in devel because the changelogs/CHANGELOG*.rst docs fileglob comes up empty --- changelogs/CHANGELOG.rst | 6 ++++++ packaging/rpm/ansible.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 changelogs/CHANGELOG.rst diff --git a/changelogs/CHANGELOG.rst b/changelogs/CHANGELOG.rst new file mode 100644 index 0000000000..6668a3984d --- /dev/null +++ b/changelogs/CHANGELOG.rst @@ -0,0 +1,6 @@ +Placeholder changelog +===================== + +This file is a placeholder; a version-specific ``CHANGELOG-vX.Y.rst`` will be generated during releases from fragments +under changelogs/fragments. On release branches once a release has been created, consult the branch's version-specific +file for changes that have occurred in that branch. diff --git a/packaging/rpm/ansible.spec b/packaging/rpm/ansible.spec index c7b72ce708..8b0c103a16 100644 --- a/packaging/rpm/ansible.spec +++ b/packaging/rpm/ansible.spec @@ -128,7 +128,7 @@ rm -rf %{buildroot} %{_bindir}/ansible* %dir %{_datadir}/ansible %config(noreplace) %{_sysconfdir}/ansible -%doc README.rst PKG-INFO COPYING changelogs/CHANGELOG-*.rst +%doc README.rst PKG-INFO COPYING changelogs/CHANGELOG*.rst %doc %{_mandir}/man1/ansible* %changelog