From dc901bd5dbfefd82ff3e29bd43682ed3cf4b3b23 Mon Sep 17 00:00:00 2001
From: kzak <kzak@fedoraproject.org>
Date: Wed, 5 Oct 2005 09:30:40 +0000
Subject: [PATCH] update to upstrem cvs version

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

diff --git a/.cvsignore b/.cvsignore
index a916d1b..b9be158 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-psmisc-21.6.tar.gz
+psmisc-21.7.tar.gz
diff --git a/psmisc.spec b/psmisc.spec
index 145756c..75787de 100644
--- a/psmisc.spec
+++ b/psmisc.spec
@@ -5,14 +5,11 @@
 
 Summary: Utilities for managing processes on your system.
 Name: psmisc
-Version: 21.6
-Release: 1
+Version: 21.7
+Release: 1.cvs20051005
 License: BSD/GPL
 Group: Applications/System
 Source: ftp://ftp.sf.net/pub/sourceforge/psmisc/psmisc-%{version}.tar.gz
-Patch0: psmisc-20.2-56186.patch
-Patch1: psmisc-21.6-selinux.patch
-Patch2: psmisc-21.6-fuser-pid.patch
 URL: http://psmisc.sourceforge.net
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: libtermcap-devel
@@ -20,6 +17,8 @@ BuildRequires: libtermcap-devel
 BuildRequires: libselinux-devel
 %endif
 
+Patch0: psmisc-21.7-fuser-pid.patch
+
 %description
 The psmisc package contains utilities for managing processes on your
 system: pstree, killall and fuser.  The pstree command displays a tree
@@ -30,21 +29,11 @@ of processes that are using specified files or filesystems.
 
 %prep
 %setup -q
-%patch0 -p1 -b .56186
-
-%if %{WITH_SELINUX}
-%patch1 -p1 -b .selinux
-%endif
-
-%patch2 -p1 -b .pid
+%patch0 -p1 -b .pid
 
 %build
-aclocal
-automake -a
-autoconf
 export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE"
-
-# FIXME: Is --prefix actually necessary here?  I think it's redundant... test later...
+./autogen.sh
 %if %{WITH_SELINUX}
 %configure --prefix=/usr --enable-selinux
 %else
@@ -57,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT
 # The rpm makeinstall macro breaks the build, so we do it the old way
 make install DESTDIR="$RPM_BUILD_ROOT"
 
+# install more stable old version of fuser
+mv $RPM_BUILD_ROOT%{_bindir}/oldfuser $RPM_BUILD_ROOT%{_bindir}/fuser
+
 mkdir -p $RPM_BUILD_ROOT/sbin
 mv $RPM_BUILD_ROOT%{_bindir}/fuser $RPM_BUILD_ROOT/sbin
 %if ! %{with_pidof}
@@ -82,6 +74,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Wed Oct  5 2005 Karel Zak <kzak@redhat.com> 21.7-1.cvs20051005
+- sync with upstream CVS
+- use old version of fuser
+
 * Thu Sep  8 2005 Karel Zak <kzak@redhat.com> 21.6-1
 - sync with upstream release 21.6
 - cleanup selinux patch
@@ -186,7 +182,7 @@ rm -rf $RPM_BUILD_ROOT
 - Autogenerate the signal list from %{_includedir}/bits/signum.h
   to make sure it works on all arches and doesn't break again.
 
-* Wed May  8 2002 Trond Eivind Glomsrød <teg@redhat.com> 20.2-3
+* Wed May  8 2002 Trond Eivind Glomsrod <teg@redhat.com> 20.2-3
 - Fix the signal list
 - Don't strip when linking
 - Use a %%{_tmppath}
diff --git a/sources b/sources
index b898d9e..c273df4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6994f227b38b09cb3f3bdd3bc5fc65fe  psmisc-21.6.tar.gz
+b77cf2279241eb580a10c8dd411cff79  psmisc-21.7.tar.gz