update to new upstream version and spec cleanups

This commit is contained in:
Jan Görig 2010-09-16 11:04:23 +02:00
parent f0316b04e1
commit a0f571c2da
4 changed files with 9 additions and 30 deletions

1
.gitignore vendored
View File

@ -1 +1,2 @@
psmisc-22.10.tar.gz
/psmisc-22.13.tar.gz

View File

@ -1,13 +0,0 @@
diff -up psmisc-22.6/configure.ac.types psmisc-22.6/configure.ac
--- psmisc-22.6/configure.ac.types 2008-04-07 12:21:50.000000000 +0200
+++ psmisc-22.6/configure.ac 2008-04-07 12:22:14.000000000 +0200
@@ -67,7 +67,8 @@ AC_CHECK_MEMBERS([struct user_regs_struc
struct user_regs_struct.rax,
struct user_regs_struct.rdi,
struct user_regs_struct.rsi,
- struct user_regs_struct.rdx], [],[], [#include <sys/user.h>])
+ struct user_regs_struct.rdx], [],[], [#include <sys/types.h>
+ #include <sys/user.h>])
AC_CHECK_MEMBERS([struct pt_regs.orig_gpr3,
struct pt_regs.gpr], [],[], [#include <linux/ptrace.h>])
AM_CONDITIONAL(WANT_PEEKFD_I386,

View File

@ -1,6 +1,6 @@
Summary: Utilities for managing processes on your system
Name: psmisc
Version: 22.10
Version: 22.13
Release: 1%{?dist}
License: GPLv2+
Group: Applications/System
@ -8,9 +8,6 @@ Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
URL: http://sourceforge.net/projects/psmisc
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
#fix configure.ac to include all the required headers for peekfd
Patch0: psmisc-22.6-types.patch
BuildRequires: libselinux-devel
BuildRequires: gettext
BuildRequires: ncurses-devel
@ -26,26 +23,16 @@ of processes that are using specified files or filesystems.
%prep
%setup -q
%patch0 -p1 -b .types
%build
export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE"
autoreconf
%configure --prefix=%{_prefix} --enable-selinux
make %{?_smp_mflags}
%install
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"
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
%ifnarch %ix86 x86_64 ppc ppc64
rm -f $RPM_BUILD_ROOT/%{_mandir}/man1/peekfd.1*
%endif
%find_lang %name
@ -63,13 +50,17 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/killall.1*
%{_mandir}/man1/pstree.1*
%{_mandir}/man1/prtstat.1*
%ifarch %ix86 x86_64 ppc ppc64
%{_bindir}/peekfd
%{_mandir}/man1/peekfd.1*
%endif
%doc AUTHORS ChangeLog COPYING README
%changelog
* Thu Sep 16 2010 Jan Görig <jgorig@redhat.com> 22.13-1
- updated to new upstream version
- removed unused patch
- peekfd should work on all architectures now
- spec cleanups
* Mon May 25 2010 Jan Görig <jgorig@redhat.com> 22.10-1
- update to new upstream version
- remove unused patches

View File

@ -1 +1 @@
e881383e7f399121cd0ce744f97d91a5 psmisc-22.10.tar.gz
e2c339e6b65b730042084023784a729e psmisc-22.13.tar.gz