update to new upstream version and spec cleanups
This commit is contained in:
parent
f0316b04e1
commit
a0f571c2da
1
.gitignore
vendored
1
.gitignore
vendored
@ -1 +1,2 @@
|
|||||||
psmisc-22.10.tar.gz
|
psmisc-22.10.tar.gz
|
||||||
|
/psmisc-22.13.tar.gz
|
||||||
|
@ -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,
|
|
23
psmisc.spec
23
psmisc.spec
@ -1,6 +1,6 @@
|
|||||||
Summary: Utilities for managing processes on your system
|
Summary: Utilities for managing processes on your system
|
||||||
Name: psmisc
|
Name: psmisc
|
||||||
Version: 22.10
|
Version: 22.13
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
Group: Applications/System
|
Group: Applications/System
|
||||||
@ -8,9 +8,6 @@ Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
|
|||||||
URL: http://sourceforge.net/projects/psmisc
|
URL: http://sourceforge.net/projects/psmisc
|
||||||
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
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: libselinux-devel
|
||||||
BuildRequires: gettext
|
BuildRequires: gettext
|
||||||
BuildRequires: ncurses-devel
|
BuildRequires: ncurses-devel
|
||||||
@ -26,26 +23,16 @@ of processes that are using specified files or filesystems.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch0 -p1 -b .types
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE"
|
|
||||||
autoreconf
|
|
||||||
%configure --prefix=%{_prefix} --enable-selinux
|
%configure --prefix=%{_prefix} --enable-selinux
|
||||||
make %{?_smp_mflags}
|
make %{?_smp_mflags}
|
||||||
|
|
||||||
%install
|
%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"
|
make install DESTDIR="$RPM_BUILD_ROOT"
|
||||||
|
|
||||||
mkdir -p $RPM_BUILD_ROOT/sbin
|
mkdir -p $RPM_BUILD_ROOT/sbin
|
||||||
mv $RPM_BUILD_ROOT%{_bindir}/fuser $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
|
%find_lang %name
|
||||||
|
|
||||||
@ -63,13 +50,17 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%{_mandir}/man1/killall.1*
|
%{_mandir}/man1/killall.1*
|
||||||
%{_mandir}/man1/pstree.1*
|
%{_mandir}/man1/pstree.1*
|
||||||
%{_mandir}/man1/prtstat.1*
|
%{_mandir}/man1/prtstat.1*
|
||||||
%ifarch %ix86 x86_64 ppc ppc64
|
|
||||||
%{_bindir}/peekfd
|
%{_bindir}/peekfd
|
||||||
%{_mandir}/man1/peekfd.1*
|
%{_mandir}/man1/peekfd.1*
|
||||||
%endif
|
|
||||||
%doc AUTHORS ChangeLog COPYING README
|
%doc AUTHORS ChangeLog COPYING README
|
||||||
|
|
||||||
%changelog
|
%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
|
* Mon May 25 2010 Jan Görig <jgorig@redhat.com> 22.10-1
|
||||||
- update to new upstream version
|
- update to new upstream version
|
||||||
- remove unused patches
|
- remove unused patches
|
||||||
|
Loading…
Reference in New Issue
Block a user