diff --git a/psmisc.changes b/psmisc.changes index 538c356..3092a7c 100644 --- a/psmisc.changes +++ b/psmisc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu May 21 13:39:34 UTC 2015 - schwab@suse.de + +- Replace negative list %nopeek with positive list %have_peekfd + ------------------------------------------------------------------- Tue Mar 24 11:58:08 UTC 2015 - werner@suse.de diff --git a/psmisc.spec b/psmisc.spec index fe27edf..c1e78ab 100644 --- a/psmisc.spec +++ b/psmisc.spec @@ -1,7 +1,7 @@ # # spec file for package psmisc # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -40,7 +40,7 @@ Patch42: %{name}-22.21-upstream.patch # PATCH-FIX-UPSTREAM psmisc-git-3638cc55b4d08851faba46635d737b24d016665b.patch bnc#874983 Patch43: %{name}-git-3638cc55b4d08851faba46635d737b24d016665b.patch -%define nopeek s390 s390x ia64 %sparc hppa aarch64 +%define have_peekfd %ix86 x86_64 ppc ppc64 ppc64le %arm mipsel m68k %description The psmisc package contains utilities for managing processes on your @@ -77,7 +77,7 @@ make %{?_smp_mflags} 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 +%ifnarch %have_peekfd rm -f $RPM_BUILD_ROOT%{_mandir}/man1/peekfd.1* %endif %find_lang psmisc @@ -86,7 +86,7 @@ rm -f $RPM_BUILD_ROOT%{_mandir}/man1/peekfd.1* %defattr (-,root,root,755) /bin/fuser %{_bindir}/killall -%ifnarch %nopeek +%ifarch %have_peekfd %{_bindir}/peekfd %endif %{_bindir}/prtstat @@ -94,7 +94,7 @@ rm -f $RPM_BUILD_ROOT%{_mandir}/man1/peekfd.1* %{_bindir}/pstree.x11 %{_mandir}/man1/fuser.1* %{_mandir}/man1/killall.1* -%ifnarch %nopeek +%ifarch %have_peekfd %{_mandir}/man1/peekfd.1* %endif %{_mandir}/man1/prtstat.1*