diff --git a/watchdog-5.5-cleanup-nfs.patch b/watchdog-5.5-cleanup-nfs.patch deleted file mode 100644 index a45bd13..0000000 --- a/watchdog-5.5-cleanup-nfs.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -uNrp watchdog-5.3.1.orig/src/nfsmount_xdr.c watchdog-5.3.1/src/nfsmount_xdr.c ---- watchdog-5.3.1.orig/src/nfsmount_xdr.c 2007-05-30 13:00:37.000000000 -0400 -+++ watchdog-5.3.1/src/nfsmount_xdr.c 2007-05-30 13:02:04.000000000 -0400 -@@ -204,14 +204,14 @@ xdr_ppathcnf (XDR *xdrs, ppathcnf *objp) - if (!xdr_short (xdrs, &objp->pc_pipe_buf)) - return FALSE; - -- } else { -+ } /*else { - IXDR_PUT_LONG(buf, objp->pc_link_max); - IXDR_PUT_SHORT(buf, objp->pc_max_canon); - IXDR_PUT_SHORT(buf, objp->pc_max_input); - IXDR_PUT_SHORT(buf, objp->pc_name_max); - IXDR_PUT_SHORT(buf, objp->pc_path_max); - IXDR_PUT_SHORT(buf, objp->pc_pipe_buf); -- } -+ } */ - if (!xdr_u_char (xdrs, &objp->pc_vdisable)) - return FALSE; - if (!xdr_char (xdrs, &objp->pc_xxx)) diff --git a/watchdog.spec b/watchdog.spec index a13730a..3f2ca39 100644 --- a/watchdog.spec +++ b/watchdog.spec @@ -1,7 +1,7 @@ Summary: Software and/or Hardware watchdog daemon Name: watchdog Version: 5.5 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL+ Group: System Environment/Daemons @@ -12,7 +12,6 @@ Source2: README.watchdog.ipmi Source3: README.Fedora Patch0: %{name}-%{version}-cleanup.patch -Patch1: %{name}-%{version}-cleanup-nfs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -46,7 +45,6 @@ cp %{SOURCE2} . cp %{SOURCE3} . %patch0 -p1 -b .cleanup -%patch1 -p1 -b .cleanup-nfs mv README README.orig iconv -f ISO-8859-1 -t UTF-8 < README.orig > README @@ -101,6 +99,9 @@ fi %changelog +* Fri Mar 13 2009 Richard W.M. Jones - 5.5-3 +- Remove dubious "cleanup-nfs" patch. + * Thu Mar 5 2009 Richard W.M. Jones - 5.5-2 - Use '-' in defattr line instead of explicit file mode.