Sync with AL9
This commit is contained in:
parent
660307f82d
commit
aec5f4a53e
3
.gitignore
vendored
3
.gitignore
vendored
@ -1,2 +1 @@
|
||||
SOURCES/insights-client-3.1.7.tar.gz
|
||||
SOURCES/insights-core.egg
|
||||
SOURCES/insights-client-3.2.2.tar.xz
|
||||
|
||||
@ -1,2 +1 @@
|
||||
0862807b4cb4e8bcbb6bad73e4d689da8f320bf8 SOURCES/insights-client-3.1.7.tar.gz
|
||||
6113b8e15d58f13779a85f1e53773da28ec63ca7 SOURCES/insights-core.egg
|
||||
a136d72cd0378d8181688be3498e062ec1f3612d SOURCES/insights-client-3.2.2.tar.xz
|
||||
|
||||
@ -1,26 +0,0 @@
|
||||
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
|
||||
|
||||
The PathExists= directive in the Path section of the
|
||||
insights-client-results.path unit is unnecessary.
|
||||
|
||||
Fixes: RHBZ#2022191
|
||||
(cherry picked from commit ec3502eaef144838bec85dfed497de7a404a66bf)
|
||||
---
|
||||
data/systemd/insights-client-results.path.in | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/data/systemd/insights-client-results.path.in b/data/systemd/insights-client-results.path.in
|
||||
index be53998..928296b 100644
|
||||
--- a/data/systemd/insights-client-results.path.in
|
||||
+++ b/data/systemd/insights-client-results.path.in
|
||||
@@ -13,7 +13,6 @@ Documentation=man:insights-client(8)
|
||||
PartOf=insights-client.timer
|
||||
|
||||
[Path]
|
||||
-PathExists=@pkgsysconfdir@/.lastupload
|
||||
PathModified=@pkgsysconfdir@/.lastupload
|
||||
|
||||
[Install]
|
||||
@ -1,17 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v1
|
||||
|
||||
iQIVAwUAY2PHlnUU932DZrDZAQipRg//erkkOLyV++i0nhK+AqOdvYNLzjPIGSas
|
||||
p33F0n5nRYjE/pP/a5bOSrlIDqhx5W0L3obAxQqJ1WNfsTpi0e/ixKJFcM+vSDQC
|
||||
xzMNoHmyaE+/SqaOgzaSciHPfFme+m30G2VaUV+tKK7/GSiqbsdYpQGTV+fEC3Kp
|
||||
2kmB6udN2K7BK54yHEYPdaOoB1zkBDklwi/hgdKILMZ8Zyjrihj3ExUIz5prZBTy
|
||||
XoYYFq+u+TJn7Abhb1xDneMqr2Aba42DfFahL4Jqek6cBPG58m1CVZ9tp7ajof53
|
||||
dTFimJVzTEVCVYY8D6grV0KosTDLYR/A8vRo/dtYf/F6SqoBA26c77p19oBaXG1O
|
||||
OTS+36t+FHxvKNY0JYcpD9TwNxGk5VSqjJVxF0pFqHZfsX8ZxiT4oGdp4l10pQ1H
|
||||
zqFNRB9QDMLKN+utK0BmpycVsWvxf0WWTFmtw3ysgsLtA+w9sYaSK21Uprti178o
|
||||
jQF7KBIxTwFLRvJmxIJ9JaKnKSkOTw2TJw8RF9N4oCf582V7TmFifRVTx+L/SxiJ
|
||||
tJx5P+aDzTI9HVwNKwiyy2uoXob3amqxs9fedvHhbIUe65ZWA705Tj8p3Y1NvKhE
|
||||
cYvrkJ/QD+aiZA3XyO5nZcGkqz5TCKRJMR6T5VslZ8nHdR/Nsa7m/m1hoONOos1N
|
||||
eUib1m4rXag=
|
||||
=izRE
|
||||
-----END PGP SIGNATURE-----
|
||||
@ -1,23 +1,18 @@
|
||||
%define _binaries_in_noarch_packages_terminate_build 0
|
||||
|
||||
%global __python %{_libexecdir}/platform-python
|
||||
|
||||
Name: insights-client
|
||||
Summary: Uploads Insights information to Red Hat on a periodic basis
|
||||
Version: 3.1.7
|
||||
Release: 12%{?dist}
|
||||
Source0: https://github.com/RedHatInsights/insights-client/releases/download/v%{version}/insights-client-%{version}.tar.gz
|
||||
Source1: https://api.access.redhat.com/r/insights/v1/static/core/insights-core.egg
|
||||
Source2: https://api.access.redhat.com/r/insights/v1/static/core/insights-core.egg.asc
|
||||
Version: 3.2.2
|
||||
Release: 1%{?dist}.alma.1
|
||||
Source0: https://github.com/RedHatInsights/insights-client/releases/download/v%{version}/insights-client-%{version}.tar.xz
|
||||
Epoch: 0
|
||||
License: GPLv2+
|
||||
URL: https://console.redhat.com/insights
|
||||
Group: Applications/System
|
||||
Vendor: Red Hat, Inc.
|
||||
|
||||
#
|
||||
# patches_ignore=DROP-IN-RPM
|
||||
# patches_base=3.1.7
|
||||
Patch0001: 0001-fix-remove-PathExists-condition-from-unit.patch
|
||||
|
||||
Provides: redhat-access-insights = %{version}-%{release}%{?dist}
|
||||
|
||||
Obsoletes: redhat-access-insights <= 1.0.13-2
|
||||
@ -29,21 +24,22 @@ Requires: tar
|
||||
Requires: gpg
|
||||
Requires: pciutils
|
||||
|
||||
%global __python3 /usr/libexec/platform-python
|
||||
%{?__python3:Requires: %{__python3}}
|
||||
%{?systemd_requires}
|
||||
Requires: python3-requests >= 2.6
|
||||
Requires: python3-PyYAML
|
||||
Requires: python3-magic
|
||||
Requires: python3-six
|
||||
Requires: platform-python-setuptools
|
||||
Requires: python3dist(setuptools)
|
||||
Requires: coreutils
|
||||
BuildRequires: wget
|
||||
BuildRequires: binutils
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: platform-python-devel
|
||||
BuildRequires: systemd
|
||||
BuildRequires: pam
|
||||
BuildRequires: meson
|
||||
BuildRequires: python3-pytest
|
||||
BuildRequires: systemd-rpm-macros
|
||||
Requires(post): policycoreutils-python-utils
|
||||
|
||||
|
||||
@ -55,15 +51,12 @@ Sends insightful information to Red Hat for automated analysis
|
||||
|
||||
|
||||
%build
|
||||
%{configure} PYTHON=%{__python3}
|
||||
%{__make}
|
||||
%{meson} -Dpython=%{__python}
|
||||
%{meson_build}
|
||||
|
||||
|
||||
%install
|
||||
%{make_install}
|
||||
%{__install} -D -m 644 %{_builddir}/%{name}-%{version}/data/insights-client.motd %{buildroot}/%{_sysconfdir}/insights-client/insights-client.motd
|
||||
%{__install} -D -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/insights-client/rpm.egg
|
||||
%{__install} -D -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/insights-client/rpm.egg.asc
|
||||
%{meson_install}
|
||||
|
||||
# Create different insights directories in /var
|
||||
mkdir -p %{buildroot}%{_localstatedir}/log/insights-client/
|
||||
@ -88,6 +81,7 @@ if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then
|
||||
/usr/sbin/semanage permissive --add insights_client_t || true
|
||||
fi
|
||||
|
||||
|
||||
%preun
|
||||
%systemd_preun %{name}.timer
|
||||
%systemd_preun %{name}.service
|
||||
@ -113,8 +107,14 @@ if [ $1 -eq 0 ]; then
|
||||
rm -rf %{_localstatedir}/lib/insights
|
||||
rm -rf %{_localstatedir}/log/insights-client
|
||||
rm -f %{_sysconfdir}/insights-client/.*.etag
|
||||
rm -f %{_sysconfdir}/logrotate.d/insights-client
|
||||
fi
|
||||
|
||||
|
||||
%clean
|
||||
rm -rf %{buildroot}
|
||||
|
||||
|
||||
%files
|
||||
%config(noreplace) %{_sysconfdir}/insights-client/*.conf
|
||||
%{_sysconfdir}/insights-client/insights-client.motd
|
||||
@ -132,7 +132,8 @@ fi
|
||||
%attr(700,root,root) %dir %{_localstatedir}/cache/insights-client/
|
||||
%attr(750,root,root) %dir %{_localstatedir}/cache/insights/
|
||||
%attr(750,root,root) %dir %{_localstatedir}/lib/insights/
|
||||
|
||||
%{_sysconfdir}/logrotate.d/insights-client
|
||||
%{_tmpfilesdir}/insights-client.conf
|
||||
|
||||
%doc
|
||||
%defattr(-, root, root)
|
||||
@ -141,50 +142,59 @@ fi
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon Jan 30 2023 Link Dupont <link@redhat.com> - 3.1.7-12
|
||||
- Conditionally run semanage only when SELinux is enabled (RHBZ#2150908)
|
||||
* Thu Nov 02 2023 Eduard Abdullin <eabdullin@almalinux.org> 0:3.2.2-1.alma.1
|
||||
- Update to 3.2.2
|
||||
|
||||
* 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 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)
|
||||
|
||||
* Tue Nov 08 2022 Link Dupont <link@redhat.com> 0:3.1.7-10
|
||||
- Include insights-core.egg as RPM source (RHBZ#2029395)
|
||||
* Wed Nov 09 2022 Link Dupont <link@redhat.com> 0:3.1.7-11
|
||||
- Include insights-core.egg as RPM source (RHBZ#2141087)
|
||||
|
||||
* Mon Sep 19 2022 Gael Chamoulaud <gchamoul@redhat.com> 3.1.7-9
|
||||
- Add /var/cache/insights-client/ directory in files directives (RHBZ#2127962)
|
||||
* 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)
|
||||
|
||||
* 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 Sep 12 2022 Gael Chamoulaud <gchamoul@redhat.com> 3.1.7-9
|
||||
- Add /var/cache/insights-client/ directory in files directives (RHBZ#2126105)
|
||||
|
||||
* 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)
|
||||
* Fri Apr 08 2022 Gael Chamoulaud <gchamoul@redhat.com> 0:3.1.7-8
|
||||
- Add several insights /var directories in files directives
|
||||
|
||||
* Mon Mar 14 2022 Gael Chamoulaud (Strider) <gchamoul@redhat.com> 0:3.1.7-6
|
||||
* Mon Mar 14 2022 Gael Chamoulaud (Strider) <gchamoul@redhat.com> 0:3.1.7-7
|
||||
- Update patches
|
||||
|
||||
* Wed Feb 16 2022 Gaël Chamoulaud <gchamoul@redhat.com> - 3.1.7-5
|
||||
* 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-4
|
||||
- Restore insights-client-boot.service preun/postun (RHBZ#2055036)
|
||||
* Wed Feb 16 2022 Gaël Chamoulaud <gchamoul@redhat.com> - 3.1.7-5
|
||||
- Restore insights-client-boot.service preun/postun (RHBZ#2024836)
|
||||
|
||||
* Wed Feb 16 2022 Gaël Chamoulaud <gchamoul@redhat.com> - 3.1.7-3
|
||||
- Remove scriptlets referencing nonexistent files (RHBZ#2055036)
|
||||
* Wed Feb 02 2022 Gaël Chamoulaud <gchamoul@redhat.com> - 3.1.7-4
|
||||
- Renaming "cloud.redhat.com" to "console.redhat.com" (RHBZ#2013799)
|
||||
|
||||
* 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
|
||||
* 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)
|
||||
|
||||
* Fri Jan 28 2022 Link Dupont <link@redhat.com> - 3.1.7-2
|
||||
- Remove scriptlets referencing nonexistent files (RHBZ#2024836)
|
||||
|
||||
* Wed Oct 20 2021 Link Dupont <link@redhat.com> - 3.1.7-1
|
||||
- New upstream version (Resolves RHBZ#2013800)
|
||||
- New upstream release (Resolves RHBZ#2013799)
|
||||
- Disable client metrics collection
|
||||
- Create fallback.json dynamically at build time
|
||||
|
||||
* 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 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
|
||||
|
||||
* Tue Apr 20 2021 Jeremy Crafts <jcrafts@redhat.com> - 3.1.2-1
|
||||
- New upstream version
|
||||
|
||||
Loading…
Reference in New Issue
Block a user