From fb0bc0eb6bc52fdc28006e1a69a325a1079ba7a4 Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Thu, 5 Sep 2019 14:38:32 -0700 Subject: [PATCH] [stable-2.9] Fix rpm dependencies for ansible-test Needs to require ansible = version rather than ansible-version (cherry picked from commit 59afffa) Co-authored-by: Toshio Kuratomi --- changelogs/fragments/fix-rpm-spec.yaml | 4 ++++ packaging/rpm/ansible.spec | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 changelogs/fragments/fix-rpm-spec.yaml diff --git a/changelogs/fragments/fix-rpm-spec.yaml b/changelogs/fragments/fix-rpm-spec.yaml new file mode 100644 index 00000000000..94bae7fc192 --- /dev/null +++ b/changelogs/fragments/fix-rpm-spec.yaml @@ -0,0 +1,4 @@ +--- +bugfixes: + - Fix the upstream rpm spec file. The ansible-test package requirement on + the main ansible package was formatted incorrectly. diff --git a/packaging/rpm/ansible.spec b/packaging/rpm/ansible.spec index a77939e5ad1..84679d497b3 100644 --- a/packaging/rpm/ansible.spec +++ b/packaging/rpm/ansible.spec @@ -160,7 +160,7 @@ are transferred to managed machines automatically. %package -n ansible-test Summary: Tool for testing ansible plugin and module code -Requires: %{name}-%{version}-%{release} +Requires: %{name} = %{version}-%{release} %if 0%{?rhel} >= 8 # Will use the python3 stdlib venv #Requires: python3-virtualenv