downstream: Remove dependency on dhcp-client (ISC DHCP) and use dhcpc…

…d instead

Cloud-init 24.1 and above versions supports dhcpcd since ISC DHCP is not
maintained any more and has already reached its EOL. Please see upstream
cloud-init commit
21b2b6e ("feat(dhcp): Add support for dhcpcd (canonical#4746)") and PR
canonical#4746

and also https://www.isc.org/blogs/isc-dhcp-eol/ .

Also dhcpcd is the default dhcp client for cloud-init. Please see the commit
6d61b63 ("feat(dhcp): Make dhcpcd the default dhcp client (canonical#4912)")

Therefore, change the downstream spec file to remove dependency on dhcp-client
and add a dependency on dhcpcd instead.

Signed-off-by: Ani Sinha <anisinha@redhat.com>
(cherry picked from commit e262a903b831217ff4cfa5ee2a43053e0dac0923)
Signed-off-by: Cathy Avery <cavery@redhat.com>

.distro/cloud-init.spec

@@ -33,12 +33,11 @@ BuildRequires:  python3dist(responses)
 BuildRequires:  python3dist(passlib)
 %endif
 
-# ISC DHCP is no longer maintained and cloud-init will ship a 
-# release with dhcpcd support soon. See BZ 2247055 for details.
+# ISC DHCP is no longer maintained and cloud-init 24.1 now supports
+# dhcpcd. See commit 21b2b6e4423b0fec325 and the upstream PR
+# https://github.com/canonical/cloud-init/pull/4746.
 #
-# Cloud-init dhcpcd support is pending a release here:
-# https://github.com/canonical/cloud-init/pull/4746/files
-Requires:       dhcp-client
+Requires:       dhcpcd
 
 Requires:       hostname
 Requires:       e2fsprogs