diff --git a/.gitignore b/.gitignore
index 3721526..1440909 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/insights-client-3.0.14.tar.gz
+SOURCES/insights-client-3.1.1.tar.gz
diff --git a/.insights-client.metadata b/.insights-client.metadata
index 4bcb4b2..02fae66 100644
--- a/.insights-client.metadata
+++ b/.insights-client.metadata
@@ -1 +1 @@
-e67aa1adab226f13ffc066a628352bf1dc6cff6d SOURCES/insights-client-3.0.14.tar.gz
+b20ae53eb3bd1954f0cd9de9d1f131452d9395ab SOURCES/insights-client-3.1.1.tar.gz
diff --git a/SOURCES/0001-systemd-don-t-sleep-when-running-check-results.patch b/SOURCES/0001-systemd-don-t-sleep-when-running-check-results.patch
deleted file mode 100644
index aa8ea28..0000000
--- a/SOURCES/0001-systemd-don-t-sleep-when-running-check-results.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 78f9a1cb2d36fa2d35f64280dc0caa06e1fefcc1 Mon Sep 17 00:00:00 2001
-From: Link Dupont
-Date: Thu, 20 Aug 2020 10:31:47 -0400
-Subject: [PATCH] systemd: don't sleep when running "check-results"
-
-Resolves: RHBZ#1870186
-Signed-off-by: Link Dupont
----
- data/systemd/insights-client-results.service.in | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/data/systemd/insights-client-results.service.in b/data/systemd/insights-client-results.service.in
-index 4f3b2c5..4866805 100644
---- a/data/systemd/insights-client-results.service.in
-+++ b/data/systemd/insights-client-results.service.in
-@@ -17,6 +17,5 @@ After=network-online.target
- [Service]
- Type=oneshot
- RemainAfterExit=no
--ExecStart=@bindir@/sleep 120
- ExecStart=@bindir@/insights-client --check-results
- Restart=no
---
-2.25.1
-
diff --git a/SPECS/insights-client.spec b/SPECS/insights-client.spec
index 97b459e..6ea8bfd 100644
--- a/SPECS/insights-client.spec
+++ b/SPECS/insights-client.spec
@@ -1,11 +1,11 @@
%define _binaries_in_noarch_packages_terminate_build 0
+%global __python /usr/bin/python2
Name: insights-client
Summary: Uploads Insights information to Red Hat on a periodic basis
-Version: 3.0.14
-Release: 3%{?dist}
-Source0: https://github.com/redhatinsights/insights-client/archive/insights-client-%{version}.tar.gz
-Patch0: 0001-systemd-don-t-sleep-when-running-check-results.patch
+Version: 3.1.1
+Release: 1%{?dist}
+Source0: https://github.com/redhatinsights/insights-client/releases/download/v%{version}/insights-client-%{version}.tar.gz
Epoch: 0
License: GPLv2+
URL: http://cloud.redhat.com/insights
@@ -52,9 +52,7 @@ Sends insightful information to Red Hat for automated analysis
%install
%{make_install}
-%{__install} -d -m 755 %{buildroot}/%{_localstatedir}/log/insights-client
-%{__install} -d -m 755 %{buildroot}/%{_localstatedir}/lib/insights
-
+%{__rm} %{buildroot}%{_sysconfdir}/insights-client/insights-client.motd
%post
%systemd_post %{name}.timer
@@ -73,7 +71,8 @@ if [ $1 -eq 0 ]; then
rm -f %{_sysconfdir}/cron.daily/insights-client
rm -f %{_sysconfdir}/ansible/facts.d/insights.fact
rm -f %{_sysconfdir}/ansible/facts.d/insights_machine_id.fact
- rm -f %{_localstatedir}/lib/insights/*
+ rm -rf %{_localstatedir}/lib/insights
+ rm -rf %{_localstatedir}/log/insights-client
fi
@@ -88,11 +87,9 @@ rm -rf %{buildroot}
%{_sysconfdir}/insights-client/rpm.egg*
%{_bindir}/*
%{_unitdir}/*
- %attr(440,root,root) %{_sysconfdir}/insights-client/*.pem
- %attr(440,root,root) %{_sysconfdir}/insights-client/redhattools.pub.gpg
+ %attr(444,root,root) %{_sysconfdir}/insights-client/*.pem
+ %attr(444,root,root) %{_sysconfdir}/insights-client/redhattools.pub.gpg
%{python_sitelib}/insights_client/
-%{_localstatedir}/log/insights-client
-%{_localstatedir}/lib/insights
%{_defaultdocdir}/%{name}
%doc
@@ -102,6 +99,9 @@ rm -rf %{buildroot}
%changelog
+* Mon Nov 30 2020 Link Dupont - 3.1.1-1
+- New upstream release (RHBZ#1899592)
+
* Thu Aug 20 2020 Link Dupont - 3.0.14-3
- Backport patch to disable sleeping a systemd unit (RHBZ#1870658)