From 213fc922d3b2364da4803f8cfa01278c9cd93af3 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Apr 07 2020 09:13:42 +0000
Subject: import insights-client-3.0.13-1.el8_1


---

diff --git a/.gitignore b/.gitignore
index bfd48fd..aa025ac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/insights-client-3.0.8.tar.gz
+SOURCES/insights-client-3.0.13.tar.gz
diff --git a/.insights-client.metadata b/.insights-client.metadata
index 9b8f801..52ee5e9 100644
--- a/.insights-client.metadata
+++ b/.insights-client.metadata
@@ -1 +1 @@
-ff2ad762a4a7a399223e31020862b199d4e718f3 SOURCES/insights-client-3.0.8.tar.gz
+45551b29abdd79a985f35198a8b04040ae2e591a SOURCES/insights-client-3.0.13.tar.gz
diff --git a/SPECS/insights-client.spec b/SPECS/insights-client.spec
index c285371..8f67865 100644
--- a/SPECS/insights-client.spec
+++ b/SPECS/insights-client.spec
@@ -1,9 +1,12 @@
+%if 0%{?rhel} != 8
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%endif
 %define _binaries_in_noarch_packages_terminate_build 0
 
 Name:                   insights-client
 Summary:                Uploads Insights information to Red Hat on a periodic basis
-Version:                3.0.8
-Release:                4%{?dist}
+Version:                3.0.13
+Release:                1%{?dist}
 Source0:                https://github.com/redhatinsights/insights-client/archive/insights-client-%{version}.tar.gz
 Epoch:                  0
 License:                GPLv2+
@@ -68,11 +71,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %if 0%{?rhel} == 8
 %{__python3} setup.py install --root=${RPM_BUILD_ROOT} $PREFIX
 pathfix.py -pni "%{__python3}" %{buildroot}%{python3_sitelib}/insights_client/{__init__.py,major_version.py,run.py}
-pathfix.py -pni "%{__python3}" %{buildroot}%{_bindir}/insights-client-run
 pathfix.py -pni "%{__python3}" %{buildroot}%{_bindir}/insights-client
 pathfix.py -pni "%{__python3}" %{buildroot}%{_bindir}/redhat-access-insights
 %else
-%{__python2} setup.py install --root=${RPM_BUILD_ROOT} $PREFIX
+%{__python} setup.py install --root=${RPM_BUILD_ROOT} $PREFIX
 %endif
 
 %post
@@ -127,16 +129,16 @@ fi
 
 # if the logging directory isnt created then make it
 if ! [ -d "/var/log/insights-client" ]; then
-mkdir -m 640 /var/log/insights-client
+mkdir -m 750 /var/log/insights-client
 fi
 
 # if the library directory for eggs and such isn't present
 # make it
 if ! [ -d "/var/lib/insights" ]; then
-mkdir -m 644 /var/lib/insights
+mkdir -m 755 /var/lib/insights
 fi
 
-%if 0%{?rhel} != 6
+%if 0%{?rhel} == 8
 #Link motd into place. Only do so if motd file doesn't exist and insights hasn't been used
 if [ ! -e /etc/motd.d/insights-client -a ! -L /etc/motd.d/insights-client ]; then
     mkdir -p /etc/motd.d
@@ -193,7 +195,7 @@ rm -f %{_bindir}/redhat-access-insights
 rm -rf /etc/redhat-access-insights/
 rm -f /etc/cron.daily/redhat-access-insights
 rm -f /etc/cron.weekly/redhat-access-insights
-%if 0%{?rhel} != 6
+%if 0%{?rhel} == 8
 rm -f /etc/motd.d/insights-client
 %endif
 fi
@@ -207,7 +209,7 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 /etc/insights-client/.fallback.json
 /etc/insights-client/.fallback.json.asc
 /etc/insights-client/.exp.sed
-%if 0%{?rhel} != 6
+%if 0%{?rhel} == 8
 %config(noreplace) %attr(644,root,root) /etc/insights-client/insights-client.motd
 %endif
 
@@ -221,10 +223,10 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 
 %attr(755,root,root) %{_bindir}/insights-client
 %attr(755,root,root) %{_bindir}/redhat-access-insights
-%attr(755,root,root) %{_bindir}/insights-client-run
 
 %if 0%{?rhel} == 6
 %attr(755,root,root) /etc/insights-client/insights-client.cron
+%config(noreplace) %attr(644,root,root) /etc/sysconfig/insights-client
 %endif
 
 %attr(644,root,root) /etc/insights-client/rpm.egg
@@ -236,13 +238,13 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 %attr(644,root,root) %{python3_sitelib}/insights_client/*.py*
 %attr(744,root,root) %{python3_sitelib}/insights_client/__pycache__
 %else
-%attr(755,root,root) %{python2_sitelib}/insights_client*.egg-info
-%attr(644,root,root) %{python2_sitelib}/insights_client*.egg-info/*
-%attr(644,root,root) %{python2_sitelib}/insights_client/*.py*
+%attr(755,root,root) %{python_sitelib}/insights_client*.egg-info
+%attr(644,root,root) %{python_sitelib}/insights_client*.egg-info/*
+%attr(644,root,root) %{python_sitelib}/insights_client/*.py*
 %endif
 
-%attr(640,root,root) /var/log/insights-client
-%attr(644,root,root) /var/lib/insights
+%attr(750,root,root) /var/log/insights-client
+%attr(755,root,root) /var/lib/insights
 
 %doc
 %defattr(-, root, root)
@@ -250,6 +252,9 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 /usr/share/man/man5/*.5.gz
 
 %changelog
+* Tue Feb 11 2020 Link Dupont <link@redhat.com> - 3.0.13-1
+- Resolves: RHBZ#1801833
+
 * Thu Oct 24 2019 Jeremy Crafts <jcrafts@redhat.com> - 3.0.8-4
 - Resolves: BZ1760749