update to upstream cvs version

.cvsignore

@@ -1 +1 @@
-psmisc-21.8.tar.gz
+psmisc-22.1.03072006cvs.tar.gz

psmisc.spec

@@ -1,7 +1,7 @@
 Summary: Utilities for managing processes on your system.
 Name: psmisc
-Version: 21.8
-Release: 1.2.1
+Version: 22.1.03072006cvs
+Release: 1
 License: BSD/GPL
 Group: Applications/System
 Source: ftp://ftp.sf.net/pub/sourceforge/psmisc/psmisc-%{version}.tar.gz
@@ -10,8 +10,7 @@ Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: libtermcap-devel
 BuildRequires: libselinux-devel
 
-Patch0: psmisc-21.7-fuser-pid.patch
-Patch1: psmisc-21.7-killall-scanf.patch
+Patch0: psmisc-22.1-fuser-silent.patch
 
 %description
 The psmisc package contains utilities for managing processes on your
@@ -23,11 +22,11 @@ of processes that are using specified files or filesystems.
 
 %prep
 %setup -q
-%patch0 -p1 -b .pid
-%patch1 -p1 -b .scanf
+%patch0 -p1
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE"
+./autogen.sh
 %configure --prefix=/usr --enable-selinux
 make 
 
@@ -36,12 +35,10 @@ 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
 rm -f $RPM_BUILD_ROOT/%{_mandir}/man1/pidof.1*
+rm -f $RPM_BUILD_ROOT/%{_bindir}/oldfuser
 
 %find_lang %name
 
@@ -59,6 +56,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/pstree.1*
 
 %changelog
+* Tue Mar  7 2006 Karel Zak <kzak@redhat.com> 22.1.03072006cvs-1
+- update to new upstream CVS version 
+- enable new fuser version
+- fix fuser return code 
+- fix #183897 - "pstree -a" call results in segmentation fault
+
 * Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 21.8-1.2.1
 - bump again for double-long bug on ppc(64)
 

sources

@@ -1 +1 @@
-d6276e071c10ddf4b0d98856e5573e1a  psmisc-21.8.tar.gz
+25f607bb96467f2b094201d81b50c8cb  psmisc-22.1.03072006cvs.tar.gz