diff --git a/.gitignore b/.gitignore index 4677a24..06b0c93 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /insights-client-3.1.7.tar.gz /insights-core.egg /insights-core.egg.asc +/insights-client-3.2.0.tar.xz diff --git a/insights-client.spec b/insights-client.spec index 386b7a5..dcf599d 100644 --- a/insights-client.spec +++ b/insights-client.spec @@ -1,35 +1,24 @@ %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: 13%{?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.0 +Release: 1%{?dist} +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 -Obsoletes: redhat-access-proactive <= 1.0.13-2 - BuildArch: noarch Requires: tar Requires: gpg Requires: pciutils -%global __python3 /usr/libexec/platform-python %{?__python3:Requires: %{__python3}} %{?systemd_requires} Requires: python3-requests >= 2.6 @@ -38,12 +27,14 @@ Requires: python3-magic Requires: python3-six 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 Requires(post): policycoreutils-python-utils @@ -55,15 +46,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/ @@ -113,6 +101,7 @@ 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 @@ -137,6 +126,7 @@ rm -rf %{buildroot} %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 %doc %defattr(-, root, root) @@ -145,6 +135,12 @@ rm -rf %{buildroot} %changelog +* Fri Jun 23 2023 Alba Hita Catala - 0:3.2.0-1 +- Add logrotate (RHBZ#2189281) +- Fix constant not imported (RHBZ#2091919) +- Update to cgroupv2 (RHBZ#2148270) +- New upstream release + * Thu May 18 2023 Pino Toscano - 0:3.1.7-13 - Conditionally run semanage only when SELinux is enabled (RHBZ#2196844) diff --git a/sources b/sources index 06562ef..6164ee5 100644 --- a/sources +++ b/sources @@ -1,3 +1 @@ -SHA512 (insights-client-3.1.7.tar.gz) = 3c3119f42f1cfb505a69f8217416c53f4e74f3c48a8e2c77ce487c405fa5ed00c0e15e4216bcd5da89b80e397f09c22b79bfd5e9b228838b0f283c520039a9e1 -SHA512 (insights-core.egg) = 04fba794f2ad647f06c85451679ac5fb33ebee4db53db1b75139a902bc4b8bd8f0a6a2c48b50a9af2d4f2840024202d52c469747359cb7743d42ca9f217ca675 -SHA512 (insights-core.egg.asc) = 301142c758371c8e4cff764578a818895285dfacafc12e5e29cb5edd432e905c368168379dfe68312c384c0d5396317ba1d91bdbca5365d07b1f8a0cc5a1a56c +SHA512 (insights-client-3.2.0.tar.xz) = 66a0247856440df1671d5edd4682c859e1acfa102fbb5cd1fe61d877a079917117b22437a18d2fea28991a0a67039e00f63623ca45788c0853bd265f0aa98650