chore: update developer specfile redhat/fedora and dependencies (canonical#6326)

Author: blackboxsw

packages/pkg-deps.json

@@ -69,6 +69,25 @@
          "hostname"
       ]
    },
+   "fedora": {
+      "build-requires" : [
+         "bash-completion-devel",
+         "meson",
+         "pkgconf",
+         "python3-devel",
+         "systemd-devel"
+      ],
+      "requires" : [
+         "e2fsprogs",
+         "iproute",
+         "net-tools",
+         "procps",
+         "rsyslog",
+         "shadow-utils",
+         "sudo",
+         "hostname"
+      ]
+   },
    "suse" : {
       "renames" : {
          "jinja2" : "python3-Jinja2",

packages/redhat/cloud-init.spec.in

@@ -1,11 +1,4 @@
 ## template: jinja
-%define use_systemd (0%{?fedora} && 0%{?fedora} >= 18) || (0%{?rhel} && 0%{?rhel} >= 7)
-
-%if %{use_systemd}
-%define init_system systemd
-%else
-%define init_system sysvinit
-%endif
 
 # See: http://www.zarb.org/~jasonc/macros.php
 # Or: http://fedoraproject.org/wiki/Packaging:ScriptletSnippets
@@ -14,7 +7,7 @@
 Name:           cloud-init
 Version:        {{rpm_upstream_version}}
 Release:        1{{subrelease}}%{?dist}
-Summary:        Cloud instance initilization tool
+Summary:        Cloud instance initialization tool
 
 Group:          System Environment/Base
 License:        Dual-licesed GPLv3 or Apache 2.0
@@ -24,20 +17,10 @@ Source0:        {{archive_name}}
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}
 
-%if "%{?el6}" == "1"
-BuildRequires:  python-argparse
-%endif
-%if %{use_systemd}
-Requires:           systemd
-BuildRequires:      systemd
-Requires:           systemd-units
-BuildRequires:      systemd-units
-%else
-Requires:           initscripts >= 8.36
-Requires(postun):   initscripts
-Requires(post):     chkconfig
-Requires(preun):    chkconfig
-%endif
+Requires:       systemd
+BuildRequires:  pkgconfig(systemd)
+Requires:       systemd-units
+BuildRequires:  systemd-units
 
 {% for r in buildrequires %}
 BuildRequires:  {{r}}
@@ -61,16 +44,9 @@ Requires:       {{r}}
 Patch{{loop.index0}}: {{p}}
 {% endfor %}
 
-%if "%{init_system}" == "systemd"
 Requires(post):       systemd
 Requires(preun):      systemd
 Requires(postun):     systemd
-%else
-Requires(post):       chkconfig
-Requires(postun):     initscripts
-Requires(preun):      chkconfig
-Requires(preun):      initscripts
-%endif
 
 %description
 Cloud-init is a set of init scripts for cloud instances.  Cloud instances
@@ -86,7 +62,7 @@ ssh keys and to let the user run various scripts.
 {% endfor %}
 
 %build
-%meson -Dinit_system=systemd
+%meson -Dinit_system=systemd -Ddistro_templates=chef_client.rb.tmpl,chrony.conf.rhel.tmpl,hosts.redhat.tmpl,ntp.conf.rhel.tmpl,resolv.conf.tmpl,timesyncd.conf.tmpl
 %meson_build
 
 %install
@@ -113,68 +89,23 @@ version_pys=$(cd "$RPM_BUILD_ROOT" && find . -name version.py -type f)
 rm -rf $RPM_BUILD_ROOT
 
 %post
+%systemd_post cloud-init-main.service cloud-config.service cloud-config.target cloud-final.service cloud-init-network.service cloud-init.target cloud-init-local.service
 
-%if "%{init_system}" == "systemd"
-if [ $1 -eq 1 ]
-then
-    /bin/systemctl enable cloud-init-main.service       >/dev/null 2>&1 || :
-    /bin/systemctl enable cloud-init-local.service >/dev/null 2>&1 || :
-    /bin/systemctl enable cloud-init-network.service       >/dev/null 2>&1 || :
-    /bin/systemctl enable cloud-config.service     >/dev/null 2>&1 || :
-    /bin/systemctl enable cloud-final.service      >/dev/null 2>&1 || :
-fi
-%else
-/sbin/chkconfig --add %{_initrddir}/cloud-init-local
-/sbin/chkconfig --add %{_initrddir}/cloud-init
-/sbin/chkconfig --add %{_initrddir}/cloud-config
-/sbin/chkconfig --add %{_initrddir}/cloud-final
-%endif
 
 %preun
+%systemd_preun cloud-init-main.service cloud-config.service cloud-config.target cloud-final.service cloud-init-network.service cloud-init.target cloud-init-local.service
 
-%if "%{init_system}" == "systemd"
-if [ $1 -eq 0 ]
-then
-    /bin/systemctl --no-reload disable cloud-init-main.service >/dev/null 2>&1 || :
-    /bin/systemctl --no-reload disable cloud-init-local.service >/dev/null 2>&1 || :
-    /bin/systemctl --no-reload disable cloud-init-network.service   >/dev/null 2>&1 || :
-    /bin/systemctl --no-reload disable cloud-config.service >/dev/null 2>&1 || :
-    /bin/systemctl --no-reload disable cloud-final.service  >/dev/null 2>&1 || :
-fi
-%else
-if [ $1 -eq 0 ]
-then
-    /sbin/service cloud-init stop >/dev/null 2>&1 || :
-    /sbin/chkconfig --del cloud-init || :
-    /sbin/service cloud-init-local stop >/dev/null 2>&1 || :
-    /sbin/chkconfig --del cloud-init-local || :
-    /sbin/service cloud-config stop >/dev/null 2>&1 || :
-    /sbin/chkconfig --del cloud-config || :
-    /sbin/service cloud-final stop >/dev/null 2>&1 || :
-    /sbin/chkconfig --del cloud-final || :
-fi
-%endif
 
 %postun
-
-%if "%{init_system}" == "systemd"
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-%endif
+%systemd_postun cloud-init-main.service cloud-config.service cloud-config.target cloud-final.service cloud-init-network.service cloud-init.target cloud-init-local.service
 
 %files
 
 %{_udevrulesdir}/66-azure-ephemeral.rules
 
-%if "%{init_system}" == "systemd"
 /usr/lib/systemd/system-generators/cloud-init-generator
 /usr/lib/systemd/system/[email protected]/disable-sshd-keygen-if-cloud-init-active.conf
 %{_unitdir}/cloud-*
-%else
-%attr(0755, root, root) %{_initddir}/cloud-config
-%attr(0755, root, root) %{_initddir}/cloud-final
-%attr(0755, root, root) %{_initddir}/cloud-init-local
-%attr(0755, root, root) %{_initddir}/cloud-init
-%endif
 
 # Program binaries
 %{_bindir}/cloud-init*

tools/read-dependencies

@@ -26,7 +26,7 @@ DISTRO_PKG_TYPE_MAP = {
     "centos": "redhat",
     "eurolinux": "redhat",
     "miraclelinux": "redhat",
-    "fedora": "redhat",
+    "fedora": "fedora",
     "rocky": "redhat",
     "redhat": "redhat",
     "debian": "debian",
@@ -107,10 +107,12 @@ ZYPPER_INSTALL = [
 
 DRYRUN_DISTRO_INSTALL_PKG_CMD = {
     "redhat": ["yum", "install", "--assumeyes"],
+    "fedora": ["yum", "install", "--assumeyes"],
 }
 
 DISTRO_INSTALL_PKG_CMD = {
     "redhat": MAYBE_RELIABLE_YUM_INSTALL,
+    "fedora": MAYBE_RELIABLE_YUM_INSTALL,
     "debian": ["apt", "install", "-y"],
     "suse": ZYPPER_INSTALL,
 }