From 7fd38ada22ac622e4d15bede1ec34d76c6702d52 Mon Sep 17 00:00:00 2001
From: DistroBaker <osci-list@redhat.com>
Date: Tue, 26 Jan 2021 03:11:31 +0000
Subject: [PATCH] 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#d27cad75f13ac650e00c4b5525228413a8380083
---
 .gitignore    |  1 +
 logwatch.spec | 15 +++++----------
 sources       |  1 +
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index ed7eb22..e6c0c78 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@ logwatch-7.3.6.tar.gz
 /logwatch-7.5.2.tar.gz
 /logwatch-7.5.3.tar.gz
 /logwatch-7.5.4.tar.gz
+/logwatch-7.5.5.tar.gz
diff --git a/logwatch.spec b/logwatch.spec
index 5418a1e..0067a92 100644
--- a/logwatch.spec
+++ b/logwatch.spec
@@ -1,14 +1,12 @@
 %global _unitdir /usr/lib/systemd/system
 Summary: A log file analysis program
 Name: logwatch
-Version: 7.5.4
-Release: 4%{?dist}
+Version: 7.5.5
+Release: 1%{?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)
@@ -32,7 +30,6 @@ of the package on many systems.
 
 %prep
 %setup -q
-cp -p %{SOURCE1} .
 
 %build
 
@@ -91,9 +88,6 @@ 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
@@ -109,8 +103,6 @@ install -m 0644 %{SOURCE1} %{buildroot}%{_datadir}/logwatch/dist.conf/logfiles
 %dir %{_datadir}/logwatch/dist.conf
 %dir %{_datadir}/logwatch/dist.conf/services
 %dir %{_datadir}/logwatch/dist.conf/logfiles
-# Fix for DNF 4.4
-%{_datadir}/logwatch/dist.conf/logfiles/*.conf
 %{_datadir}/logwatch/scripts/logwatch.pl
 %config(noreplace) %{_datadir}/logwatch/default.conf/*.conf
 %{_sbindir}/logwatch
@@ -132,6 +124,9 @@ install -m 0644 %{SOURCE1} %{buildroot}%{_datadir}/logwatch/dist.conf/logfiles
 %{_unitdir}/logwatch.timer
 
 %changelog
+* Tue Jan 26 2021 Frank Crawford <frank@crawford.emu.id.au> - 7.5.5-1
+- Update to 7.5.5
+
 * Mon Dec 14 2020 Orion Poplawski <orion@nwra.com> - 7.5.4-4
 - Systemd unit files are not executable
 
diff --git a/sources b/sources
index c529248..8a125b8 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 SHA512 (logwatch-7.5.4.tar.gz) = 6e6a5e8b7ae977244ea97895e06cccde320fce3dfbd2b1c58c945fc8872325a9676c8afe122b1f7230cb6617b64813caf90ef37fc472a1b200eb0b24ea72fa9b
+SHA512 (logwatch-7.5.5.tar.gz) = 71df4d69d7e580b21dc0a0f813201822a161ada68a19c6d3f0df9c8576f22c8d43ebe90643d6184e91ee1c6628de9501896a9444ff7ad6af6fe17eba5d3573f2