From 24225066d8a9af6bf05313616a02c989192ee823 Mon Sep 17 00:00:00 2001
From: Fabien Boucher <fboucher@redhat.com>
Date: Aug 13 2020 08:52:26 +0000
Subject: Fix missing systemd require for subpackages


---

diff --git a/zuul.rpmlintrc b/zuul.rpmlintrc
index 3fe02f6..e33bc31 100644
--- a/zuul.rpmlintrc
+++ b/zuul.rpmlintrc
@@ -57,3 +57,5 @@ addFilter("zuul-executor.noarch: E: devel-dependency libffi-devel")
 addFilter("zuul-executor.noarch: E: explicit-lib-dependency libffi-devel")
 # No idea for this one
 addFilter("zuul-doc.noarch: W: wrong-file-end-of-line-encoding /usr/share/doc/zuul-doc/html/objects.inv")
+# Expected - https://github.com/rpm-software-management/rpmlint/issues/427
+addFilter("zuul.noarch: E: useless-provides bundled(ansible)")
diff --git a/zuul.spec b/zuul.spec
index 7dd7cd5..2a1d532 100644
--- a/zuul.spec
+++ b/zuul.spec
@@ -72,7 +72,9 @@ BuildRequires:  python3-graphene
 BuildRequires:  systemd
 BuildRequires:  ansible
 
-Provides:       bundled(ansible)
+Provides:       bundled(ansible) = 2.9
+Provides:       bundled(ansible) = 2.8
+Provides:       bundled(ansible) = 2.7
 
 %description
 Zuul is a program that drives continuous integration, delivery,
@@ -90,6 +92,7 @@ Please refers to README.fedora for build and deployment instruction.
 %package scheduler
 Summary: The Zuul scheduler service
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: systemd
 
 %description scheduler
 The main Zuul process. Handles receiving events, executing jobs,
@@ -101,6 +104,7 @@ the other components use for coordination.
 %package merger
 Summary: The Zuul merger service
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: systemd
 
 %description merger
 Scale-out component that performs git merge operations.
@@ -123,6 +127,7 @@ streaming of logs.
 %package executor
 Summary: The Zuul executor service
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: systemd
 Requires: git-core
 Requires: bubblewrap
 # zuul-manage-ansible requires them to create ansible virtualenvs
@@ -142,6 +147,7 @@ One or more of these must be run.
 %package fingergw
 Summary: Executor finger gateway service
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: systemd
 
 %description fingergw
 A gateway which provides finger protocol access to live streaming of logs.
@@ -273,6 +279,7 @@ exit 0
 
 %files
 %license LICENSE
+%doc README.rst
 %dir %attr(0755,zuul,zuul) %{_sysconfdir}/zuul
 %config(noreplace) %attr(0640,zuul,zuul) %{_sysconfdir}/zuul/zuul.conf
 %config(noreplace) %attr(0644,zuul,zuul) %{_sysconfdir}/zuul/main.yaml