Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/logwatch.git#ed575b747b27a99a2c85ef875e8fc2f1de122d76
This commit is contained in:
DistroBaker 2020-11-23 11:41:22 +00:00
parent d95a794b57
commit 1c421205e5
2 changed files with 24 additions and 1 deletions

12
dnf-rpm.conf Normal file
View File

@ -0,0 +1,12 @@
# What actual file? Defaults to LogPath if not absolute path....
LogFile = dnf.rpm.log
Archive = dnf.rpm.log.*
Archive = dnf.rpm.log-*
# Keep only the lines in the proper date range...
#*ApplyStdDate = "%b %d %H:%M:%S"
# New date format for DNF 4.4
*ApplyStdDate = "%FT%H:%M:%S%z"
# vi: shiftwidth=3 tabstop=3 et

View File

@ -2,11 +2,13 @@
Summary: A log file analysis program
Name: logwatch
Version: 7.5.4
Release: 2%{?dist}
Release: 3%{?dist}
License: MIT
URL: https://sourceforge.net/projects/logwatch
Source0: logwatch-%{version}.tar.gz
#Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
# Temporary fix for update to DNF 4.4
Source1: dnf-rpm.conf
BuildRequires: perl-generators
Requires: grep mailx
Requires: perl(Date::Manip)
@ -30,6 +32,7 @@ of the package on many systems.
%prep
%setup -q
cp -p %{SOURCE1} .
%build
@ -88,6 +91,9 @@ echo "###### REGULAR EXPRESSIONS IN THIS FILE WILL BE TRIMMED FROM REPORT OUTPUT
echo "# Local configuration options go here (defaults are in %{_datadir}/logwatch/default.conf/logwatch.conf)" > %{buildroot}%{_sysconfdir}/logwatch/conf/logwatch.conf
echo "# Configuration overrides for specific logfiles/services may be placed here." > %{buildroot}%{_sysconfdir}/logwatch/conf/override.conf
# Fix for DNF 4.4
install -m 0644 %{SOURCE1} %{buildroot}%{_datadir}/logwatch/dist.conf/logfiles
%files
%doc README HOWTO-Customize-LogWatch LICENSE
%dir %{_var}/cache/logwatch
@ -98,11 +104,13 @@ echo "# Configuration overrides for specific logfiles/services may be placed her
%dir %{_sysconfdir}/logwatch/conf/services
%dir %{_sysconfdir}/logwatch/scripts/services
%config(noreplace) %{_sysconfdir}/cron.daily/0logwatch
# Fix for DNF 4.4
%config(noreplace) %{_sysconfdir}/logwatch/conf/*.conf
%dir %{_datadir}/logwatch
%dir %{_datadir}/logwatch/dist.conf
%dir %{_datadir}/logwatch/dist.conf/services
%dir %{_datadir}/logwatch/dist.conf/logfiles
%{_datadir}/logwatch/dist.conf/logfiles/*.conf
%{_datadir}/logwatch/scripts/logwatch.pl
%config(noreplace) %{_datadir}/logwatch/default.conf/*.conf
%{_sbindir}/logwatch
@ -124,6 +132,9 @@ echo "# Configuration overrides for specific logfiles/services may be placed her
%{_unitdir}/logwatch.timer
%changelog
* Mon Nov 23 2020 Frank Crawford <frank@crawford.emu.id.au> - 7.5.4-3
- Handle changes for DNF 4.4
* Mon Nov 09 2020 Frank Crawford <frank@crawford.emu.id.au> - 7.5.4-2
- Add requires for perl-diagnostics (#1893671) and perl-lib (#1893503)
- Add other requires as nothing is now automatically supplied