diff --git a/SOURCES/0014-Bump-release-to-9.patch b/SOURCES/0014-Bump-release-to-9.patch new file mode 100644 index 0000000..e837b28 --- /dev/null +++ b/SOURCES/0014-Bump-release-to-9.patch @@ -0,0 +1,22 @@ +From f8fc07787591af5f4ccd1ed24cdef30b5871c799 Mon Sep 17 00:00:00 2001 +From: Richard Brantley +Date: Wed, 14 Mar 2018 10:20:00 -0400 +Subject: [PATCH] Bump release to 9 + +--- + insights_client/constants.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/insights_client/constants.py b/insights_client/constants.py +index 4e77354..4784e67 100644 +--- a/insights_client/constants.py ++++ b/insights_client/constants.py +@@ -5,4 +5,4 @@ Constants + + class InsightsConstants(object): + app_name = 'insights-client' +- version = '3.0.3-8' ++ version = '3.0.3-9' +-- +2.14.3 + diff --git a/SPECS/insights-client.spec b/SPECS/insights-client.spec index 9a1fc26..ba2e37b 100644 --- a/SPECS/insights-client.spec +++ b/SPECS/insights-client.spec @@ -7,7 +7,7 @@ Name: insights-client Summary: Uploads Insights information to Red Hat on a periodic basis Version: 3.0.3 -Release: 8%{?dist} +Release: 9%{?dist} Source0: https://github.com/redhatinsights/insights-client/archive/insights-client-%{version}.tar.gz Epoch: 0 License: GPLv2+ @@ -67,6 +67,7 @@ Patch10: 0010-Updating-egg-signature.patch Patch11: 0011-Bump-release-to-7.patch Patch12: 0012-GPG-verify-egg-in-parent-process.patch Patch13: 0013-Bump-release-to-8.patch +Patch14: 0014-Bump-release-to-9.patch %description Sends insightful information to Red Hat for automated analysis @@ -149,7 +150,16 @@ if [ $1 -eq 1 ]; then ln -sf /etc/insights-client/insights-client.cron /etc/cron.daily/insights-client %else %_bindir/systemctl start insights-client.timer + %_bindir/systemctl enable insights-client.timer %endif + else + # Need to handle RHEL 7.5 GA where timer was started but disabled + # Enable timer if it's currently started but disabled + if %_bindir/systemctl status insights-client.timer > /dev/null; then + if ! %_bindir/systemctl is-enabled insights-client.timer > /dev/null; then + %_bindir/systemctl enable insights-client.timer > /dev/null + fi + fi fi fi @@ -286,6 +296,9 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT /usr/share/man/man5/*.5.gz %changelog +* Wed Mar 14 2018 Richard Brantley - 3.0.3-8 +- Resolves: rhbz#1555041 + * Fri Feb 16 2018 Kyle Lape - 3.0.3-6 - Persist systemd timer config between reboots