From 69ceb93b56a3072dff035035c3e598567e15571d Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sun, 19 Sep 2010 18:09:40 +0000 Subject: [PATCH] Accepting request 48473 from home:vuntz:branches:Base:System OBS-URL: https://build.opensuse.org/request/show/48473 OBS-URL: https://build.opensuse.org/package/show/Base:System/psmisc?expand=0&rev=24 --- psmisc-22.12.dif | 12 ------------ psmisc-22.12.tar.bz2 | 3 --- psmisc-22.13.tar.bz2 | 3 +++ psmisc.changes | 10 ++++++++++ psmisc.spec | 13 +++---------- 5 files changed, 16 insertions(+), 25 deletions(-) delete mode 100644 psmisc-22.12.tar.bz2 create mode 100644 psmisc-22.13.tar.bz2 diff --git a/psmisc-22.12.dif b/psmisc-22.12.dif index 693d524..12f0cab 100644 --- a/psmisc-22.12.dif +++ b/psmisc-22.12.dif @@ -1,15 +1,3 @@ ---- configure.ac -+++ configure.ac 2010-07-13 13:54:30.000000000 +0000 -@@ -66,7 +66,8 @@ AC_CHECK_MEMBERS([struct user_regs_struc - struct user_regs_struct.rdi, - struct user_regs_struct.rsi, - struct user_regs_struct.rdx], [],[], -- [#include ]) -+ [#include -+ #include ]) - AC_CHECK_MEMBERS([struct pt_regs.orig_gpr3, - struct pt_regs.gpr], [],[], [#include ]) - AC_CHECK_MEMBERS([struct pt_regs.uregs],[],[], [#include ]) --- src/fuser.c +++ src/fuser.c 2010-07-13 15:01:58.000000000 +0000 @@ -1120,7 +1120,8 @@ int main(int argc, char *argv[]) diff --git a/psmisc-22.12.tar.bz2 b/psmisc-22.12.tar.bz2 deleted file mode 100644 index 0a7007f..0000000 --- a/psmisc-22.12.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a496b4e684dc5cd5ed28ae296b071701d39845e0a799396dbc005f2736340b1d -size 298393 diff --git a/psmisc-22.13.tar.bz2 b/psmisc-22.13.tar.bz2 new file mode 100644 index 0000000..4e51808 --- /dev/null +++ b/psmisc-22.13.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:45531c27bae46be5168a98edcbfc5f68c811176261631249880bc454e551c712 +size 303260 diff --git a/psmisc.changes b/psmisc.changes index 821b2cc..04351c4 100644 --- a/psmisc.changes +++ b/psmisc.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Sun Sep 19 10:36:02 CEST 2010 - vuntz@opensuse.org + +- Update to version 22.13: + + configure patch for x86_64 properly applied sf#3029302. + + patch configure so pt_regs isn't used on SuperH. deb#588986 + + Fixed configure.ac so only mipsel not mips compiles peekfd +- Remove part of psmisc-22.12.dif that is upstream. +- Remove AutoReqProv: it's default now. + ------------------------------------------------------------------- Tue Jul 13 18:47:35 CEST 2010 - werner@suse.de diff --git a/psmisc.spec b/psmisc.spec index fc85e26..2f29f3a 100644 --- a/psmisc.spec +++ b/psmisc.spec @@ -1,5 +1,5 @@ # -# spec file for package psmisc (Version 22.12) +# spec file for package psmisc (Version 22.13) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -25,12 +25,11 @@ Url: http://switch.dl.sourceforge.net/sourceforge/psmisc/ License: GPLv2+ Group: System/Monitoring PreReq: %fillup_prereq %insserv_prereq -AutoReqProv: on -Version: 22.12 +Version: 22.13 Release: 1 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 +Source: http://switch.dl.sourceforge.net/sourceforge/psmisc/%{name}-%{version}.tar.bz2 Patch0: %name-22.12.dif Patch1: %name-22.12-tigetstr.patch Patch2: %name-22.12-pstree_overflow.patch @@ -50,12 +49,6 @@ command sends a specified signal (SIGTERM if nothing is specified) to processes identified by name. The fuser command identifies the PIDs of processes that are using specified files or filesystems. - - -Authors: --------- - Werner Almesberger - %prep %setup -q %patch1 -p0 -b .tigetstr