diff --git a/.gitignore b/.gitignore index 128104c..4e07f2c 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ Ocsinventory-Agent-1.1.2.tar.gz /Ocsinventory-Unix-Agent-2.6.0.tar.gz /Ocsinventory-Unix-Agent-2.9.0.tar.gz /Ocsinventory-Unix-Agent-2.9.1.tar.gz +/Ocsinventory-Unix-Agent-2.9.3.tar.gz diff --git a/ocsinventory-agent.logrotate b/ocsinventory-agent.logrotate deleted file mode 100644 index 2483628..0000000 --- a/ocsinventory-agent.logrotate +++ /dev/null @@ -1,9 +0,0 @@ -# Rotate OCS Inventory NG agent logs daily, only if not empty -# Save 7 days old logs under compressed mode -/var/log/ocsinventory-agent/*.log { - daily - rotate 7 - compress - notifempty - missingok -} diff --git a/ocsinventory-agent.spec b/ocsinventory-agent.spec index 448805e..7af921c 100644 --- a/ocsinventory-agent.spec +++ b/ocsinventory-agent.spec @@ -16,18 +16,16 @@ %global debug_package %{nil} # Official release version -%global official_version 2.9.1 +%global official_version 2.9.3 Name: ocsinventory-agent Summary: Open Computer and Software Inventory Next Generation client -Version: 2.9.1 +Version: 2.9.3 Release: 1%{?dist} Source0: https://github.com/OCSInventory-NG/UnixAgent/releases/download/v%{official_version}/Ocsinventory-Unix-Agent-%{official_version}.tar.gz -Source1: %{name}.logrotate - Source11: %{name}.README License: GPLv2+ @@ -116,21 +114,22 @@ Requires: perl(Net::IP) Requires: perl(Net::Netmask) Requires: perl(Net::SNMP) Requires: perl(Net::SSLeay) -Requires: perl(Proc::Daemon) Requires: perl(XML::Simple) Requires: monitor-edid +Requires: net-tools +Requires: pciutils +Requires: smartmontools +Requires: which %if 0%{?fedora} >= 25 || 0%{?rhel} >= 8 Recommends: perl(Net::Cups) Recommends: perl(Net::Ping) Recommends: perl(Parse::EDID) +Recommends: perl(Proc::Daemon) +Recommends: perl(Proc::PID::File) Recommends: ipmitool Suggests: nmap Suggests: perl(Nmap::Parser) %endif -Requires: net-tools -Requires: pciutils -Requires: smartmontools -Requires: which Conflicts: %{name} < %{version} @@ -146,7 +145,9 @@ sed -e 's/\r//' -i snmp/mibs/local/6876.xml # Remove bundled modules rm -rf ./inc -perl -MConfig -i -ne 'print $_ unless m{^inc/}' MANIFEST +if [[ -e MANIFEST ]]; then + perl -MConfig -i -ne 'print $_ unless m{^inc/}' MANIFEST +fi ### # NOTE: rpmlint will complain about these macros in comments @@ -234,7 +235,6 @@ mkdir -p %{buildroot}%{_sysconfdir}/{logrotate.d,sysconfig,ocsinventory/software mkdir %{buildroot}%{_localstatedir}/lib/%{name}/download cp -pr snmp %{buildroot}%{_localstatedir}/lib/%{name}/snmp -install -pm 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/logrotate.d/%{name} install -pm 644 %{name}.conf %{buildroot}%{_sysconfdir}/sysconfig/%{name} mkdir -p %{buildroot}/%{_libexecdir}/%{name} @@ -242,6 +242,7 @@ sed -e 's;/etc/;%{_sysconfdir}/;' \ -e 's;/var/;%{_localstatedir}/;' \ -e 's;/usr/sbin/;%{_sbindir}/;' \ contrib/cron/ocsinventory-agent.cron > %{buildroot}%{_libexecdir}/%{name}/ocsinventory-agent.cron +cp contrib/cron/ocsinventory-agent.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/%{name} mkdir -p %{buildroot}/%{_unitdir} cp contrib/cron/systemd/* %{buildroot}/%{_unitdir}/ @@ -265,6 +266,8 @@ rm %{buildroot}%{_sbindir}/ipdiscover # the source comes with some odd permissions set # just fix them to make sense find %{buildroot} -type f -exec chmod 644 {} \; +find %{buildroot} -type f -name .DS_Store -exec rm {} \; +find %{buildroot} -type f -name ._.DS_Store -exec rm {} \; %post @@ -306,6 +309,9 @@ find %{buildroot} -type f -exec chmod 644 {} \; %changelog +* Tue May 31 2022 Pat Riehecky - 2.9.3-1 +- Update to 2.9.3 + * Wed Jan 26 2022 Pat Riehecky - 2.9.1-1 - Update to 2.9.1 diff --git a/sources b/sources index 2e116be..658a0c7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Ocsinventory-Unix-Agent-2.9.1.tar.gz) = efd428de593a3f681900ace81cce0d4c17a5e88088076a85e729d41ea363c2797135abed504f2c870b6bd81eeb5f1b4d93090885dfa29308737cde21ba2095a5 +SHA512 (Ocsinventory-Unix-Agent-2.9.3.tar.gz) = 90e1b25c0c3d5054a39ae60e9509eb3bf52859a1569ad1d7f61f6feca42f22febe6799e9d2265fe8de63ce6c7a00a7c2c917a9c3cae57c05ff0e42687e435e31