diff --git a/.gitignore b/.gitignore index e6c0c78..5ee8211 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ logwatch-7.3.6.tar.gz /logwatch-7.5.3.tar.gz /logwatch-7.5.4.tar.gz /logwatch-7.5.5.tar.gz +/logwatch-7.5.6.tar.gz diff --git a/logwatch.spec b/logwatch.spec index 831ace2..0a3e7e7 100644 --- a/logwatch.spec +++ b/logwatch.spec @@ -1,14 +1,11 @@ %global _unitdir /usr/lib/systemd/system -Summary: A log file analysis program +Summary: Analyzes and Reports on system logs Name: logwatch -Version: 7.5.5 -Release: 3%{?dist} +Version: 7.5.6 +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 -# Ignore CMDEND lines in 7.5.5 until next release -Patch0: cron.patch +URL: https://sourceforge.net/projects/logwatch/ +Source0: https://sourceforge.net/projects/logwatch/files/%{name}-%{version}/%{name}-%{version}.tar.gz BuildRequires: perl-generators Requires: grep mailx Requires: perl(Date::Manip) @@ -32,7 +29,6 @@ of the package on many systems. %prep %setup -q -%patch0 -p1 %build @@ -53,37 +49,41 @@ install -m 0755 -d %{buildroot}%{_datadir}/logwatch/scripts/services install -m 0755 -d %{buildroot}%{_datadir}/logwatch/scripts/shared install -m 0755 -d %{buildroot}%{_datadir}/logwatch/lib install -m 0755 -d %{buildroot}%{_sbindir} +install -m 0755 -d %{buildroot}%{_mandir}/man1 install -m 0755 -d %{buildroot}%{_mandir}/man5 install -m 0755 -d %{buildroot}%{_mandir}/man8 -for i in scripts/logfiles/*; do - if [ $(ls $i | wc -l) -ne 0 ]; then - install -m 0755 -d %{buildroot}%{_datadir}/logwatch/$i - install -m 0644 $i/* %{buildroot}%{_datadir}/logwatch/$i - fi +for i in scripts/logfiles/* ; do + if [ $(ls $i | wc -l) -ne 0 ] ; then + install -m 0755 -d %{buildroot}%{_datadir}/logwatch/$i + install -m 0644 $i/* %{buildroot}%{_datadir}/logwatch/$i + fi done install -m 0755 scripts/logwatch.pl %{buildroot}%{_datadir}/logwatch/scripts/logwatch.pl install -m 0644 scripts/services/* %{buildroot}%{_datadir}/logwatch/scripts/services install -m 0644 scripts/shared/* %{buildroot}%{_datadir}/logwatch/scripts/shared -install -m 0644 conf/logwatch.conf %{buildroot}%{_datadir}/logwatch/default.conf/logwatch.conf +install -m 0644 conf/*.conf %{buildroot}%{_datadir}/logwatch/default.conf install -m 0644 conf/logfiles/* %{buildroot}%{_datadir}/logwatch/default.conf/logfiles install -m 0644 conf/services/* %{buildroot}%{_datadir}/logwatch/default.conf/services install -m 0644 conf/html/* %{buildroot}%{_datadir}/logwatch/default.conf/html -install -m 0644 lib/Logwatch.pm %{buildroot}%{_datadir}/logwatch/lib/Logwatch.pm +install -m 0644 lib/* %{buildroot}%{_datadir}/logwatch/lib -install -m 0644 ignore.conf.5 %{buildroot}%{_mandir}/man5 -install -m 0644 override.conf.5 %{buildroot}%{_mandir}/man5 +install -m 0644 amavis-logwatch.1 %{buildroot}%{_mandir}/man1 +install -m 0644 postfix-logwatch.1 %{buildroot}%{_mandir}/man1 install -m 0644 logwatch.conf.5 %{buildroot}%{_mandir}/man5 +ln -s logwatch.conf.5 %{buildroot}%{_mandir}/man5/ignore.conf.5 +ln -s logwatch.conf.5 %{buildroot}%{_mandir}/man5/override.conf.5 install -m 0644 logwatch.8 %{buildroot}%{_mandir}/man8 install -m 0755 scheduler/logwatch.cron %{buildroot}%{_sysconfdir}/cron.daily/0logwatch mkdir -p %{buildroot}%{_unitdir} install -m 0644 scheduler/logwatch.timer %{buildroot}%{_unitdir}/logwatch.timer install -m 0644 scheduler/logwatch.service %{buildroot}%{_unitdir}/logwatch.service +install -m 0644 scheduler/systemd.conf %{buildroot}%{_datadir}/logwatch/default.conf/systemd.conf ln -s ../../%{_datadir}/logwatch/scripts/logwatch.pl %{buildroot}/%{_sbindir}/logwatch @@ -114,7 +114,7 @@ echo "# Configuration overrides for specific logfiles/services may be placed her %{_datadir}/logwatch/scripts/services %{_datadir}/logwatch/scripts/logfiles %dir %{_datadir}/logwatch/lib -%{_datadir}/logwatch/lib/Logwatch.pm +%{_datadir}/logwatch/lib/* %dir %{_datadir}/logwatch/default.conf %dir %{_datadir}/logwatch/default.conf/services %{_datadir}/logwatch/default.conf/services/*.conf @@ -127,6 +127,9 @@ echo "# Configuration overrides for specific logfiles/services may be placed her %{_unitdir}/logwatch.timer %changelog +* Sat Jul 24 2021 Frank Crawford - 7.5.6-1 +- Update to 7.5.6 + * Thu Jul 22 2021 Fedora Release Engineering - 7.5.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index 8a125b8..1e6b133 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ SHA512 (logwatch-7.5.4.tar.gz) = 6e6a5e8b7ae977244ea97895e06cccde320fce3dfbd2b1c58c945fc8872325a9676c8afe122b1f7230cb6617b64813caf90ef37fc472a1b200eb0b24ea72fa9b SHA512 (logwatch-7.5.5.tar.gz) = 71df4d69d7e580b21dc0a0f813201822a161ada68a19c6d3f0df9c8576f22c8d43ebe90643d6184e91ee1c6628de9501896a9444ff7ad6af6fe17eba5d3573f2 +SHA512 (logwatch-7.5.6.tar.gz) = fb490f5bc1bf469309ee9caa1e040d71b4332d7fb64f94865a9b5fe707a92cb10c207022ce5e279709bf3412605f67f7da11303d91aa078f680c598398aab2ab