[logwatch] Update to revision 110 Drop unnecessary patches Add proper requires

jsynacek jsynacek at fedoraproject.org
Tue Jun 19 06:47:12 UTC 2012


commit 671d9163c0ac3524b7f72187464e3d416c422a60
Author: Jan Synacek <jsynacek at redhat.com>
Date:   Tue Jun 19 08:15:57 2012 +0200

    Update to revision 110
    Drop unnecessary patches
    Add proper requires

 .gitignore                    |    1 +
 logwatch-dovecot-proxy.patch  |   79 -----------------------------------------
 logwatch-mail-headers.patch   |   12 ------
 logwatch-secure-grammar.patch |   11 ------
 logwatch-secure-update.patch  |   62 --------------------------------
 logwatch-secure.patch         |   54 ----------------------------
 logwatch-sendmail.patch       |   11 ------
 logwatch-sshd-undef.patch     |   24 ------------
 logwatch-systemd-logind.patch |   12 ------
 logwatch.spec                 |   36 ++++++------------
 sources                       |    2 +-
 11 files changed, 14 insertions(+), 290 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9ee22c6..916afa3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ logwatch-7.3.6.tar.gz
 /logwatch-svn50.tar.xz
 /logwatch-svn85.tar.xz
 /logwatch-svn100.tar.xz
+/logwatch-svn110.tar.xz
diff --git a/logwatch.spec b/logwatch.spec
index 5027bc7..40145d0 100644
--- a/logwatch.spec
+++ b/logwatch.spec
@@ -1,22 +1,20 @@
 Summary: A log file analysis program
 Name: logwatch
 Version: 7.4.0
-Release: 12.20120229svn100%{?dist}
+Release: 13.20120619svn110%{?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 100 https://logwatch.svn.sourceforge.net/svnroot/logwatch logwatch-svn100
-#  tar cJvf logwatch-svn100.tar.xz logwatch-svn100
-Source0: logwatch-svn100.tar.xz
+#  svn export -r 110 https://logwatch.svn.sourceforge.net/svnroot/logwatch logwatch-svn110
+#  tar cJvf logwatch-svn110.tar.xz logwatch-svn110
+Source0: logwatch-svn110.tar.xz
 #Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 # Needs proper fix. Not applied by the upstream.
 Patch0: logwatch-vsftpd.patch
 # Not applied by upstream.
 Patch1: logwatch-oldfiles.patch
-# Fixes not yet in upstream for /var/log/secure (rhbz#673760)
-Patch2: logwatch-secure.patch
 # Fixes not yet in upstream for DNSSEC messages in named service (rhbz#666394)
 Patch3: logwatch-named-dnssec.patch
 # Manpage typo + obsolete option
@@ -25,18 +23,10 @@ Patch5: logwatch-xntpd.patch
 Patch6: logwatch-smartd.patch
 Patch7: logwatch-dovecot.patch
 Patch8: logwatch-sshd.patch
-Patch10: logwatch-secure-grammar.patch
-Patch11: logwatch-dovecot-proxy.patch
-# not yet in upstream
-Patch12: logwatch-secure-update.patch
-# not yet in upstream
-Patch13: logwatch-mail-headers.patch
-# not yet in upstream
-Patch14: logwatch-systemd-logind.patch
-# not yet in upstream
-Patch15: logwatch-sshd-undef.patch
 Requires: textutils sh-utils grep mailx
 Requires: perl(Date::Manip)
+Requires: perl(Sys::CPU)
+Requires: perl(Sys::MemInfo)
 BuildArchitectures: noarch
 
 %description
@@ -46,22 +36,15 @@ 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-svn100
+%setup -q -n logwatch-svn110
 %patch0 -p1
 %patch1 -p1
-%patch2 -p0
 %patch3 -p1
 %patch4 -p1
 %patch5 -p0
 %patch6 -p1
 %patch7 -p0
 %patch8 -p1
-%patch10 -p1
-%patch11 -p0
-%patch12 -p0
-%patch13 -p0
-%patch14 -p0
-%patch15 -p0
 rm -f scripts/services/*.orig
 
 %build
@@ -153,6 +136,11 @@ echo "# Configuration overrides for specific logfiles/services may be placed her
 %{_mandir}/man*/*
 
 %changelog
+* Tue Jun 19 2012 Jan Synáček <jsynacek at redhat.com> - 7.4.0-13.20120619svn110
+- Update to revision 110
+- Drop unnecessary patches
+- Add proper requires
+
 * Fri May 04 2012 Jan Synáček <jsynacek at redhat.com> - 7.4.0-12.20120425svn100
 - Update secure-update patch
 - Update systemd-logind patch
diff --git a/sources b/sources
index eb00d63..ce46e0f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6436e06376dcd23063e798918971b214  logwatch-svn100.tar.xz
+95ca4f693329dedcfce499440169aacc  logwatch-svn110.tar.xz


More information about the scm-commits mailing list