- RH man page scan (#948524)

This commit is contained in:
Jaromir Capik 2013-07-30 19:33:42 +02:00
parent e36f8db914
commit 79cd825b20
2 changed files with 54 additions and 6 deletions

View File

@ -0,0 +1,39 @@
diff -Naur psmisc-22.20.orig/doc/fuser.1 psmisc-22.20/doc/fuser.1
--- psmisc-22.20.orig/doc/fuser.1 2012-09-19 12:54:03.000000000 +0200
+++ psmisc-22.20/doc/fuser.1 2013-07-30 18:59:38.975335764 +0200
@@ -170,8 +170,8 @@
\fB\-\fISIGNAL\fR
Use the specified signal instead of SIGKILL when killing processes.
Signals can be specified either by name (e.g.
-.BR \-HUP ) or by
-number (e.g.
+.BR \-HUP )
+or by number (e.g.
.BR \-1 ).
This option is silently ignored if the
.B \-k
diff -Naur psmisc-22.20.orig/doc/peekfd.1 psmisc-22.20/doc/peekfd.1
--- psmisc-22.20.orig/doc/peekfd.1 2012-09-19 12:54:03.000000000 +0200
+++ psmisc-22.20/doc/peekfd.1 2013-07-30 19:10:32.582099617 +0200
@@ -37,7 +37,7 @@
.IP -d
Remove duplicate read/writes from the output. If you're looking at a
tty with echo, you might want this.
-.IP -v
+.IP -V
Display a version string.
.IP -h
Display a help message.
diff -Naur psmisc-22.20.orig/src/pstree.c psmisc-22.20/src/pstree.c
--- psmisc-22.20.orig/src/pstree.c 2013-07-30 18:53:21.000000000 +0200
+++ psmisc-22.20/src/pstree.c 2013-07-30 19:17:14.057288441 +0200
@@ -860,7 +860,8 @@
" -V, --version display version information\n"));
#ifdef WITH_SELINUX
fprintf(stderr,
- _(" -Z show SELinux security contexts\n"));
+ _(" -Z,\n"
+ " --security-context show SELinux security contexts\n"));
#endif /*WITH_SELINUX */
fprintf(stderr, _(" PID start at this PID; default is 1 (init)\n"
" USER show only trees rooted at processes of this user\n\n"));

View File

@ -1,16 +1,12 @@
Summary: Utilities for managing processes on your system
Name: psmisc
Version: 22.20
Release: 2%{?dist}
Release: 3%{?dist}
License: GPLv2+
Group: Applications/System
Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
URL: http://sourceforge.net/projects/psmisc
BuildRequires: libselinux-devel
BuildRequires: gettext
BuildRequires: ncurses-devel
BuildRequires: autoconf automake
Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
#The following has been reworked by upstream in a different way ... we'll see
#Patch1: psmisc-22.13-fuser-silent.patch
@ -18,6 +14,15 @@ BuildRequires: autoconf automake
# Patch sent upstream 2012-10-08.
Patch2: psmisc-22.20-fix-selinux-in-pstree.patch
Patch3: psmisc-22.20-RH-man-page-scan.patch
BuildRequires: libselinux-devel
BuildRequires: gettext
BuildRequires: ncurses-devel
BuildRequires: autoconf automake
%description
The psmisc package contains utilities for managing processes on your
system: pstree, killall and fuser. The pstree command displays a tree
@ -30,6 +35,7 @@ of processes that are using specified files or filesystems.
%setup -q
%patch2 -p1
%patch3 -p1
%build
%configure --prefix=%{_prefix} --enable-selinux
@ -60,6 +66,9 @@ mv $RPM_BUILD_ROOT%{_bindir}/fuser $RPM_BUILD_ROOT/sbin
%doc AUTHORS ChangeLog COPYING README
%changelog
* Tue Jul 30 2013 Jaromir Capik <jcapik@redhat.com> - 22.20-3
- RH man page scan (#948524)
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 22.20-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild