From 51d10dcb6ceae3db3f68556056ed0df271ebdd30 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 26 Apr 2007 16:58:12 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/psmisc?expand=0&rev=4 --- psmisc.changes | 5 +++++ psmisc.spec | 14 ++++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/psmisc.changes b/psmisc.changes index 8ac0ddb..01e9505 100644 --- a/psmisc.changes +++ b/psmisc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Apr 26 17:02:11 CEST 2007 - werner@suse.de + +- Args, peekfd is ix86 specific, disable on other architectures + ------------------------------------------------------------------- Thu Apr 26 15:36:37 CEST 2007 - werner@suse.de diff --git a/psmisc.spec b/psmisc.spec index 1cf0615..344abba 100644 --- a/psmisc.spec +++ b/psmisc.spec @@ -11,14 +11,14 @@ # norootforbuild Name: psmisc -BuildRequires: gcc-c++ ncurses-devel +BuildRequires: gcc-c++ glibc-devel ncurses-devel URL: http://switch.dl.sourceforge.net/sourceforge/psmisc/ License: GNU General Public License (GPL) Group: System/Monitoring PreReq: %fillup_prereq %insserv_prereq Autoreqprov: on Version: 22.5 -Release: 1 +Release: 2 Provides: ps:/usr/bin/killall Summary: Utilities for managing processes on your system Source: http://switch.dl.sourceforge.net/sourceforge/psmisc/psmisc-%{version}.tar.bz2 @@ -26,6 +26,7 @@ Patch0: %name-%version.dif Patch1: %name-%version-pstree.patch Patch2: %name-%version-nfs4fuser.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build +%define nopeek s390 s390x ppc ppc64 x86_64 ia64 %description The psmisc package contains utilities for managing processes on your @@ -61,6 +62,9 @@ make CFLAGS="$CFLAGS" "CC=$CC" make DESTDIR=$RPM_BUILD_ROOT install mkdir -p $RPM_BUILD_ROOT/bin/ mv $RPM_BUILD_ROOT/usr/bin/fuser $RPM_BUILD_ROOT/bin/ +%ifarch %nopeek +rm -f $RPM_BUILD_ROOT%{_mandir}/man1/peekfd.1* +%endif %find_lang psmisc %clean @@ -71,16 +75,22 @@ rm -rf $RPM_BUILD_ROOT /bin/fuser %{_bindir}/oldfuser %{_bindir}/killall +%ifnarch %nopeek %{_bindir}/peekfd +%endif %{_bindir}/pstree %{_bindir}/pstree.x11 %{_mandir}/man1/fuser.1* %{_mandir}/man1/killall.1* +%ifnarch %nopeek %{_mandir}/man1/peekfd.1* +%endif %{_mandir}/man1/pstree.1* %changelog * Thu Apr 26 2007 - werner@suse.de +- Args, peekfd is ix86 specific, disable on other architectures +* Thu Apr 26 2007 - werner@suse.de - Update to psmisc-22.5 * fuser tcp works on 64bit * Added new tool peekfd