Update to revision 140 and drop upstreamed patches

This commit is contained in:
Jan Synacek 2013-05-22 14:26:39 +02:00
parent 2153d69ccf
commit d13a8ec397
3 changed files with 10 additions and 14 deletions

1
.gitignore vendored
View File

@ -8,3 +8,4 @@ logwatch-7.3.6.tar.gz
/logwatch-svn100.tar.xz
/logwatch-svn110.tar.xz
/logwatch-svn127.tar.xz
/logwatch-svn140.tar.xz

View File

@ -1,15 +1,15 @@
Summary: A log file analysis program
Name: logwatch
Version: 7.4.0
Release: 24.20130102svn127%{?dist}
Release: 25.20130522svn140%{?dist}
License: MIT
Group: Applications/System
URL: http://www.logwatch.org/
# The source for this package was pulled from upstream's vcs. Use the
# following commands to generate the tarball:
# svn export -r 127 https://logwatch.svn.sourceforge.net/svnroot/logwatch logwatch-svn127
# tar cJvf logwatch-svn127.tar.xz logwatch-svn127
Source0: logwatch-svn127.tar.xz
# svn export -r 140 https://logwatch.svn.sourceforge.net/svnroot/logwatch logwatch-svn140
# tar cJvf logwatch-svn140.tar.xz logwatch-svn140
Source0: logwatch-svn140.tar.xz
#Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
# Needs proper fix. Not applied by the upstream.
Patch0: logwatch-vsftpd.patch
@ -24,12 +24,7 @@ Patch7: logwatch-dovecot.patch
Patch9: logwatch-rkhunter.patch
# Not yet upstreamed
Patch16: logwatch-secure-userhelper.patch
# Modified version pending upstream acceptance
Patch17: logwatch-http-error.patch
# Not upstreamed yet
Patch18: logwatch-secure-username.patch
Patch19: logwatch-dovecot-timestamps.patch
Patch20: logwatch-mdadm.patch
Requires: textutils sh-utils grep mailx
Requires: perl(Date::Manip)
Requires: perl(Sys::CPU)
@ -43,7 +38,7 @@ that you wish with the detail that you wish. Easy to use - works right out
of the package on many systems.
%prep
%setup -q -n logwatch-svn127
%setup -q -n logwatch-svn140
%patch0 -p1
%patch1 -p1
%patch3 -p1
@ -51,10 +46,7 @@ of the package on many systems.
%patch7 -p1
%patch9 -p0
%patch16 -p1
%patch17 -p1
%patch18 -p1
%patch19 -p1
%patch20 -p0
rm -f scripts/services/*.orig
%build
@ -145,6 +137,9 @@ echo "# Configuration overrides for specific logfiles/services may be placed her
%{_mandir}/man*/*
%changelog
* Wed May 22 2013 Jan Synáček <jsynacek@redhat.com> - 7.4.0-25.20130522svn140
- Update to revision 140 and drop upstreamed patches
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 7.4.0-24.20130102svn127
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild

View File

@ -1 +1 @@
43b30cb2c17a50df5a10067b85a5a2f1 logwatch-svn127.tar.xz
ccfb44bf61c865fad98ea9a38500b99b logwatch-svn140.tar.xz