packages: watchdog/watchdog-config.patch, watchdog/watchdog.spec, watchdog/...

[arekm]

Author: arekm                        Date: Fri Apr 23 19:27:06 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 5.8

---- Files affected:
packages/watchdog:
   watchdog-config.patch (1.1 -> 1.2) , watchdog.spec (1.44 -> 1.45) , watchdog_5.6-6.diff (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/watchdog/watchdog-config.patch
diff -u packages/watchdog/watchdog-config.patch:1.1 packages/watchdog/watchdog-config.patch:1.2
--- packages/watchdog/watchdog-config.patch:1.1	Fri Jun 13 12:10:18 2008
+++ packages/watchdog/watchdog-config.patch	Fri Apr 23 21:27:01 2010
@@ -1,7 +1,7 @@
 diff -urN watchdog-5.4.org/watchdog.conf watchdog-5.4/watchdog.conf
 --- watchdog-5.4.org/watchdog.conf	2006-07-30 12:50:06.000000000 +0200
 +++ watchdog-5.4/watchdog.conf	2008-06-13 12:04:44.762342752 +0200
-@@ -13,22 +13,22 @@
+@@ -13,23 +13,23 @@
  
  # Note that this is the number of pages!
  # To get the real size, check how large the pagesize is on your machine.
@@ -21,11 +21,13 @@
  
  # Defaults compiled into the binary
 -#admin			= root
--#interval		= 10
+-#interval		= 1
 -#logtick                = 1
+-#logdir			= /var/log/watchdog
 +admin			= root
-+interval		= 10
++interval		= 1
 +logtick                = 1
++logdir			= /var/log/watchdog
  
  # This greatly decreases the chance that watchdog won't be scheduled before
  # your machine is really loaded

================================================================
Index: packages/watchdog/watchdog.spec
diff -u packages/watchdog/watchdog.spec:1.44 packages/watchdog/watchdog.spec:1.45
--- packages/watchdog/watchdog.spec:1.44	Tue Aug 25 15:53:05 2009
+++ packages/watchdog/watchdog.spec	Fri Apr 23 21:27:01 2010
@@ -9,17 +9,16 @@
 Summary:	A software watchdog
 Summary(pl.UTF-8):	Programowy strażnik
 Name:		watchdog
-Version:	5.6
-Release:	3
+Version:	5.8
+Release:	1
 License:	GPL
 Group:		Applications/System
 Source0:	ftp://ftp.debian.org/debian/pool/main/w/watchdog/%{name}_%{version}.orig.tar.gz
-# Source0-md5:	6df285569dd1d85528b983c98c9b2b7c
+# Source0-md5:	f0a85dbe35604f51b481666ec115aec4
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
 Patch0:		%{name}-foreground.patch
 Patch1:		%{name}-config.patch
-Patch2:		%{name}_5.6-6.diff
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	rpmbuild(macros) >= 1.268
@@ -43,7 +42,6 @@
 %setup -q
 #%patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 %{__aclocal}
@@ -90,6 +88,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.45  2010/04/23 19:27:01  arekm
+- up to 5.8
+
 Revision 1.44  2009/08/25 13:53:05  arekm
 - rel 3; fixes from debian added
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/watchdog/watchdog-config.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/watchdog/watchdog.spec?r1=1.44&r2=1.45&f=u