diff --git a/.insights-client.metadata b/.insights-client.metadata index 5e09c82..9b8f801 100644 --- a/.insights-client.metadata +++ b/.insights-client.metadata @@ -1 +1 @@ -dc4bab1ae0d565f7d1413848c1068b8f827665b9 SOURCES/insights-client-3.0.8.tar.gz +ff2ad762a4a7a399223e31020862b199d4e718f3 SOURCES/insights-client-3.0.8.tar.gz diff --git a/SPECS/insights-client.spec b/SPECS/insights-client.spec index 6c03080..c285371 100644 --- a/SPECS/insights-client.spec +++ b/SPECS/insights-client.spec @@ -3,7 +3,7 @@ Name: insights-client Summary: Uploads Insights information to Red Hat on a periodic basis Version: 3.0.8 -Release: 0%{?dist} +Release: 4%{?dist} Source0: https://github.com/redhatinsights/insights-client/archive/insights-client-%{version}.tar.gz Epoch: 0 License: GPLv2+ @@ -44,6 +44,7 @@ Requires: libcgroup Requires: python-magic Requires: python-six >= 1.9.0 BuildRequires: python2-devel +BuildRequires: python-six BuildRequires: python-setuptools %endif @@ -135,6 +136,7 @@ if ! [ -d "/var/lib/insights" ]; then mkdir -m 644 /var/lib/insights fi +%if 0%{?rhel} != 6 #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 @@ -144,6 +146,7 @@ if [ ! -e /etc/motd.d/insights-client -a ! -L /etc/motd.d/insights-client ]; the ln -sn /etc/insights-client/insights-client.motd /etc/motd.d/insights-client fi fi +%endif # always perform legacy symlinks %posttrans @@ -190,7 +193,9 @@ 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 rm -f /etc/motd.d/insights-client +%endif fi %clean @@ -202,7 +207,9 @@ 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 %config(noreplace) %attr(644,root,root) /etc/insights-client/insights-client.motd +%endif %if 0%{?rhel} != 6 %attr(644,root,root) %{_unitdir}/insights-client.service @@ -227,10 +234,10 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{python3_sitelib}/insights_client*.egg-info %attr(644,root,root) %{python3_sitelib}/insights_client*.egg-info/* %attr(644,root,root) %{python3_sitelib}/insights_client/*.py* -%attr(644,root,root) %{python3_sitelib}/insights_client/__pycache__ +%attr(744,root,root) %{python3_sitelib}/insights_client/__pycache__ %else %attr(755,root,root) %{python2_sitelib}/insights_client*.egg-info -%attr(644,root,root) %{python3_sitelib}/insights_client*.egg-info/* +%attr(644,root,root) %{python2_sitelib}/insights_client*.egg-info/* %attr(644,root,root) %{python2_sitelib}/insights_client/*.py* %endif @@ -243,9 +250,14 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT /usr/share/man/man5/*.5.gz %changelog +* Thu Oct 24 2019 Jeremy Crafts - 3.0.8-4 +- Resolves: BZ1760749 + +* Thu Sep 26 2019 Jeremy Crafts - 3.0.8-2 +- Resolves: BZ1753991 + * Fri Aug 30 2019 Jeremy Crafts - 3.0.8-0 - Modify MOTD logic and installation -- Resolves: BZ1747450 * Thu Aug 29 2019 Jeremy Crafts - 3.0.7-0 - Update core egg with bugfixes (3.0.121-1)