SOURCES/0001-fix-remove-PathExists-condition-from-unit.patch

@@ -1,4 +1,4 @@
-From 7caac84ed4119ff6013585d187720dff3fdd73fe Mon Sep 17 00:00:00 2001
+From 844a3294541fb84bd742826ca8c110c05ad9b4fd Mon Sep 17 00:00:00 2001
 From: Link Dupont <link@sub-pop.net>
 Date: Mon, 31 Jan 2022 10:53:04 -0500
 Subject: [PATCH] fix: remove PathExists condition from unit

SPECS/insights-client.spec

@@ -36,7 +36,7 @@ Requires: python3-requests >= 2.6
 Requires: python3-PyYAML
 Requires: python3-magic
 Requires: python3-six
-Requires: python3dist(setuptools)
+Requires: platform-python-setuptools
 Requires: coreutils
 BuildRequires: wget
 BuildRequires: binutils
@@ -84,7 +84,9 @@ if [ -d %{_sysconfdir}/motd.d ]; then
     fi
 fi
 
-semanage permissive --add insights_client_t
+if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then
+    /usr/sbin/semanage permissive --add insights_client_t || true
+fi
 
 %preun
 %systemd_preun %{name}.timer
@@ -97,7 +99,9 @@ semanage permissive --add insights_client_t
 %systemd_postun %{name}-boot.service
 
 if [ $1 -eq 0 ]; then
-     %{_sbindir}/semanage permissive -d insights_client_t || true
+    if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then
+        /usr/sbin/semanage permissive --delete insights_client_t || true
+    fi
 fi
 
 # Clean up files created by insights-client that are unowned by the RPM
@@ -111,11 +115,6 @@ if [ $1 -eq 0 ]; then
     rm -f %{_sysconfdir}/insights-client/.*.etag
 fi
 
-
-%clean
-rm -rf %{buildroot}
-
-
 %files
 %config(noreplace) %{_sysconfdir}/insights-client/*.conf
 %{_sysconfdir}/insights-client/insights-client.motd
@@ -134,6 +133,7 @@ rm -rf %{buildroot}
 %attr(750,root,root) %dir %{_localstatedir}/cache/insights/
 %attr(750,root,root) %dir %{_localstatedir}/lib/insights/
 
+
 %doc
 %defattr(-, root, root)
 %{_mandir}/man8/*.8.gz
@@ -141,56 +141,50 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Thu Nov 10 2022 Alba Hita Catala <ahitacat@redhat.com> 0:3.1.7-12
-- Set SELinux policy to permissive for rhcd_t module (RHBZ#2141443)
+* Mon Jan 30 2023 Link Dupont <link@redhat.com> - 3.1.7-12
+- Conditionally run semanage only when SELinux is enabled (RHBZ#2150908)
 
-* Wed Nov 09 2022 Link Dupont <link@redhat.com> 0:3.1.7-11
-- Include insights-core.egg as RPM source (RHBZ#2141087)
+* Fri Nov 11 2022 Alba Hita Catala <ahitacat@redhat.com> 0:3.1.7-11
+- Set SELinux policy to permissive for rhcd_t module (RHBZ#2141444)
 
-* Thu Oct 20 2022 Link Dupont <link@redhat.com> 0:3.1.7-10
-- Ensure __python3 macro is globally set to platform-python (RHBZ#2075150)
+* Tue Nov 08 2022 Link Dupont <link@redhat.com> 0:3.1.7-10
+- Include insights-core.egg as RPM source (RHBZ#2029395)
 
-* Mon Sep 12 2022 Gael Chamoulaud <gchamoul@redhat.com> 3.1.7-9
-- Add /var/cache/insights-client/ directory in files directives (RHBZ#2126105)
+* Mon Sep 19 2022 Gael Chamoulaud <gchamoul@redhat.com> 3.1.7-9
+- Add /var/cache/insights-client/ directory in files directives (RHBZ#2127962)
 
-* Fri Apr 08 2022 Gael Chamoulaud <gchamoul@redhat.com> 0:3.1.7-8
-- Add several insights /var directories in files directives
+* Wed Apr 13 2022 Link Dupont <link@sub-pop.net> 0:3.1.7-8
+- Ensure __python3 macro is globally set to platform-python (RHBZ#2069282)
 
-* Mon Mar 14 2022 Gael Chamoulaud (Strider) <gchamoul@redhat.com> 0:3.1.7-7
+* Thu Mar 31 2022 Gael Chamoulaud (Strider) <gchamoul@redhat.com> 0:3.1.7-7
+- Add several insights /var directories in %files directives (RHBZ#2070588)
+
+* Mon Mar 14 2022 Gael Chamoulaud (Strider) <gchamoul@redhat.com> 0:3.1.7-6
 - Update patches
 
-* Mon Mar 14 2022 Gaël Chamoulaud <gchamoul@redhat.com> - 3.1.7-6
-- Update patches
-- Add DROP-IN-RPM patches_ignore rule for rdopkg
-
 * Wed Feb 16 2022 Gaël Chamoulaud <gchamoul@redhat.com> - 3.1.7-5
-- Restore insights-client-boot.service preun/postun (RHBZ#2024836)
+- Add DROP-IN-RPM patches_ignore rule for rdopkg
 
-* Wed Feb 02 2022 Gaël Chamoulaud <gchamoul@redhat.com> - 3.1.7-4
-- Renaming "cloud.redhat.com" to "console.redhat.com" (RHBZ#2013799)
+* Wed Feb 16 2022 Gaël Chamoulaud <gchamoul@redhat.com> - 3.1.7-4
+- Restore insights-client-boot.service preun/postun (RHBZ#2055036)
 
-* Mon Jan 31 2022 Link Dupont <link@redhat.com> - 3.1.7-3
-- Patch to fix an issue where insights-client continuously launches (RHBZ#2022191)
+* Wed Feb 16 2022 Gaël Chamoulaud <gchamoul@redhat.com> - 3.1.7-3
+- Remove scriptlets referencing nonexistent files (RHBZ#2055036)
 
-* Fri Jan 28 2022 Link Dupont <link@redhat.com> - 3.1.7-2
-- Remove scriptlets referencing nonexistent files (RHBZ#2024836)
+* Thu Feb 10 2022 Gaël Chamoulaud <gchamoul@redhat.com> - 3.1.7-2
+- Rename "http://cloud.redhat.com" to "https://console.redhat.com" (RHBZ#2052875)
+- Clean superfluous %clean section - rpmlint error
 
 * Wed Oct 20 2021 Link Dupont <link@redhat.com> - 3.1.7-1
-- New upstream release (Resolves RHBZ#2013799)
+- New upstream version (Resolves RHBZ#2013800)
 - Disable client metrics collection
 - Create fallback.json dynamically at build time
 
-* Tue Aug 24 2021 Link Dupont <link@redhat.com> - 3.1.6-1
-- New upstream version
-
-* Mon Aug  2 2021 Jeremy Crafts <jcrafts@redhat.com> - 3.1.5-1
-- New upstream version
-
-* Thu May 27 2021 Jeremy Crafts <jcrafts@redhat.com> - 3.1.4-2
-- Replace platform-python-setuptools dependency with python3dist(setuptools)
-
-* Mon May 17 2021 Jeremy Crafts <jcrafts@redhat.com> - 3.1.4-1
-- New upstream version
+* Fri Jun 25 2021 Jeremy Crafts <jcrafts@redhat.com> - 3.1.5-1
+- Fix metrics auth and connection issues (RHBZ#1966761)
+- Disallow --offline and --unregister together (RHBZ#1920946)
+- Do not modify motd if already set (RHBZ#1945481)
+- Enable insights-client-boot service on install (RHBZ#1951750)
 
 * Tue Apr 20 2021 Jeremy Crafts <jcrafts@redhat.com> - 3.1.2-1
 - New upstream version