import greenboot-0.11-1.el8

.gitignore

@@ -1 +1 @@
-SOURCES/v0.10.3.tar.gz
+SOURCES/v0.11.tar.gz

.greenboot.metadata

@@ -1 +1 @@
-a71486e378d3090813c9c410040f59ba4e9fc00a SOURCES/v0.10.3.tar.gz
+bd8f27acbb02dbdca43ea07c35feb61581bc4491 SOURCES/v0.11.tar.gz

SPECS/greenboot.spec

@@ -1,10 +1,8 @@
-# Depends on pam fix rhbz#1660935
 %global debug_package %{nil}
-%bcond_with motd_status
 
 Name:               greenboot
-Version:            0.10.3
+Version:            0.11
-Release:            5%{?dist}
+Release:            1%{?dist}
 Summary:            Generic Health Check Framework for systemd
 License:            LGPLv2+
 
@@ -15,10 +13,10 @@ License:            LGPLv2+
 URL:                https://github.com/%{repo_owner}/%{repo_name}
 Source0:            https://github.com/%{repo_owner}/%{repo_name}/archive/%{repo_tag}.tar.gz
 
+ExcludeArch: s390x
 BuildRequires:      systemd-rpm-macros
 %{?systemd_requires}
 Requires:           systemd
-ExcludeArch: s390x
 
 %description
 %{summary}.
@@ -32,18 +30,17 @@ Requires:           %{name}-rpm-ostree-grub2 = %{version}-%{release}
 %description auto-update-fallback
 %{summary}.
 
-%if %{with motd_status}
 %package status
 Summary:            Message of the Day updater for greenboot
 Requires:           %{name} = %{version}-%{release}
 # PAM is required to programatically read motd messages from /etc/motd.d/*
-Requires:           pam >= 1.3.1-15
+# This needs an explicit version but we're awaiting the glacial fix for rhbz 1856828 bug
+Requires:           pam
 # While not strictly necessary to generate the motd, the main use-case of this package is to display it on SSH login
 Recommends:         openssh
 
 %description status
 %{summary}.
-%endif
 
 %package rpm-ostree-grub2
 Summary:            Scripts for greenboot on rpm-ostree-based systems using the Grub2 bootloader
@@ -75,6 +72,7 @@ Requires:           %{name} = %{version}-%{release}
 %build
 
 %install
+mkdir -p %{buildroot}%{_exec_prefix}/lib/motd.d/
 mkdir -p %{buildroot}%{_libexecdir}/%{name}
 mkdir -p %{buildroot}%{_sysconfdir}/%{name}/check/required.d
 mkdir    %{buildroot}%{_sysconfdir}/%{name}/check/wanted.d
@@ -83,17 +81,11 @@ mkdir    %{buildroot}%{_sysconfdir}/%{name}/red.d
 mkdir -p %{buildroot}%{_unitdir}
 mkdir -p %{buildroot}%{_tmpfilesdir}
 install -DpZm 0755 usr/libexec/greenboot/* %{buildroot}%{_libexecdir}/%{name}
+install -DpZm 0644 usr/lib/motd.d/boot-status %{buildroot}%{_exec_prefix}/lib/motd.d/boot-status
 install -DpZm 0644 usr/lib/systemd/system/* %{buildroot}%{_unitdir}
+install -DpZm 0644 usr/lib/tmpfiles.d/greenboot-status-motd.conf %{buildroot}%{_tmpfilesdir}/greenboot-status-motd.conf
 install -DpZm 0755 etc/greenboot/check/required.d/* %{buildroot}%{_sysconfdir}/%{name}/check/required.d
 install -DpZm 0755 etc/greenboot/check/wanted.d/* %{buildroot}%{_sysconfdir}/%{name}/check/wanted.d
-%if %{with motd_status}
-mkdir -p %{buildroot}%{_exec_prefix}/lib/motd.d/
-install -DpZm 0644 usr/lib/motd.d/boot-status %{buildroot}%{_exec_prefix}/lib/motd.d/boot-status
-install -DpZm 0644 usr/lib/tmpfiles.d/greenboot-status-motd.conf %{buildroot}%{_tmpfilesdir}/greenboot-status-motd.conf
-%else
-rm %{buildroot}%{_unitdir}/greenboot-status.service
-rm %{buildroot}%{_libexecdir}/%{name}/greenboot-status
-%endif
 
 %post
 %systemd_post greenboot-healthcheck.service
@@ -111,6 +103,9 @@ rm %{buildroot}%{_libexecdir}/%{name}/greenboot-status
 %post rpm-ostree-grub2
 %systemd_post greenboot-rpm-ostree-grub2-check-fallback.service
 
+%post status
+%systemd_post greenboot-status.service
+
 %preun
 %systemd_preun greenboot-healthcheck.service
 %systemd_preun greenboot-task-runner.service
@@ -124,6 +119,9 @@ rm %{buildroot}%{_libexecdir}/%{name}/greenboot-status
 %preun rpm-ostree-grub2
 %systemd_preun greenboot-rpm-ostree-grub2-check-fallback.service
 
+%preun status
+%systemd_preun greenboot-status.service
+
 %postun
 %systemd_postun greenboot-healthcheck.service
 %systemd_postun greenboot-task-runner.service
@@ -137,17 +135,9 @@ rm %{buildroot}%{_libexecdir}/%{name}/greenboot-status
 %postun rpm-ostree-grub2
 %systemd_postun greenboot-rpm-ostree-grub2-check-fallback.service
 
-%if %{with motd_status}
-%post status
-%systemd_post greenboot-status.service
-
 %postun status
 %systemd_postun greenboot-status.service
 
-%preun status
-%systemd_preun greenboot-status.service
-%endif
-
 %files
 %doc README.md
 %license LICENSE
@@ -166,13 +156,11 @@ rm %{buildroot}%{_libexecdir}/%{name}/greenboot-status
 %dir %{_sysconfdir}/%{name}/green.d
 %dir %{_sysconfdir}/%{name}/red.d
 
-%if %{with motd_status}
 %files status
 %{_exec_prefix}/lib/motd.d/boot-status
 %{_libexecdir}/%{name}/greenboot-status
 %{_tmpfilesdir}/greenboot-status-motd.conf
 %{_unitdir}/greenboot-status.service
-%endif
 
 %files rpm-ostree-grub2
 %{_libexecdir}/%{name}/greenboot-rpm-ostree-grub2-check-fallback
@@ -188,6 +176,10 @@ rm %{buildroot}%{_libexecdir}/%{name}/greenboot-status
 %{_unitdir}/redboot-auto-reboot.service
 
 %changelog
+* Thu Aug 20 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 0.11-1
+- Update to 0.11.0
+- Resolves: rhbz#1815140
+
 * Thu Jul 23 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 0.10.3-5
 - Make package arch specific to work around lack of grub2 on s390x
 - Resolves: rhbz#1815140