From febb9f3d65b0907af3f043a2239893a71848c812 Mon Sep 17 00:00:00 2001
From: Tomas Smetana <tsmetana@fedoraproject.org>
Date: Wed, 6 Jun 2007 14:06:56 +0000
Subject: [PATCH] new upstream version

---
 .cvsignore  |  2 +-
 psmisc.spec | 16 +++++++---------
 sources     |  2 +-
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 37568c7..b4bab76 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-psmisc-22.3.tar.gz
+psmisc-22.5.tar.gz
diff --git a/psmisc.spec b/psmisc.spec
index cfc884f..176c334 100644
--- a/psmisc.spec
+++ b/psmisc.spec
@@ -1,7 +1,7 @@
 Summary: Utilities for managing processes on your system
 Name: psmisc
-Version: 22.3
-Release: 2%{?dist}
+Version: 22.5
+Release: 1%{?dist}
 License: BSD/GPL
 Group: Applications/System
 Source: ftp://ftp.sf.net/pub/sourceforge/psmisc/psmisc-%{version}.tar.gz
@@ -12,11 +12,6 @@ BuildRequires: libselinux-devel
 BuildRequires: gettext
 BuildRequires: ncurses-devel
 
-# backport from upstream CVS
-Patch0: psmisc-22.3-fuser-ipv6.patch
-# 214214: killall <path> misbehavior (prelink, etc)
-Patch1: psmisc-22.3-killall-ino.patch
-
 %description
 The psmisc package contains utilities for managing processes on your
 system: pstree, killall and fuser.  The pstree command displays a tree
@@ -27,8 +22,6 @@ of processes that are using specified files or filesystems.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE"
@@ -54,13 +47,18 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 /sbin/fuser
 %{_bindir}/killall
+%{_bindir}/peekfd
 %{_bindir}/pstree
 %{_bindir}/pstree.x11
 %{_mandir}/man1/fuser.1*
 %{_mandir}/man1/killall.1*
 %{_mandir}/man1/pstree.1*
+%{_mandir}/man1/peekfd.1*
 
 %changelog
+* Wed Jun 06 2007 Tomas Smetana <tsmetana@redhat.com> 22.5-1
+- update to new upstream version
+
 * Thu Mar  1 2007 Karel Zak <kzak@redhat.com> 22.3-2
 - fix #214214 - killall <path> misbehavior (prelink, etc)
 
diff --git a/sources b/sources
index 00a237b..333d12f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0c44b995d068a221daf35d23e13db419  psmisc-22.3.tar.gz
+09c20fd899c2c1bd2dce02a510f99fab  psmisc-22.5.tar.gz