junk removal, RPM work, 3.0.5 prep

This commit is contained in:
albert 2002-10-21 09:07:18 +00:00
parent e7017ab912
commit 5c737719ec
6 changed files with 23 additions and 70 deletions

View File

@ -18,9 +18,9 @@
VERSION := 3 VERSION := 3
SUBVERSION := 0 SUBVERSION := 0
MINORVERSION := 4 MINORVERSION := 5
TARVERSION := 3.0.4 TARVERSION := 3.0.5
LIBVERSION := 3.0.4 LIBVERSION := 3.0.5
############ vars ############ vars
@ -50,8 +50,6 @@ BINFILES := $(usr/bin)uptime $(usr/bin)tload $(usr/bin)free $(usr/bin)w \
$(usr/bin)snice $(bin)kill $(sbin)sysctl \ $(usr/bin)snice $(bin)kill $(sbin)sysctl \
$(usr/proc/bin)pgrep $(usr/proc/bin)pkill $(usr/proc/bin)pgrep $(usr/proc/bin)pkill
SCRFILES := $(etc/X11/applnk/Utilities)top.desktop $(usr/X11R6/bin)XConsole
MANFILES := $(man1)uptime.1 $(man1)tload.1 $(man1)free.1 $(man1)w.1 \ MANFILES := $(man1)uptime.1 $(man1)tload.1 $(man1)free.1 $(man1)w.1 \
$(man1)top.1 $(man1)watch.1 $(man1)skill.1 $(man1)kill.1 \ $(man1)top.1 $(man1)watch.1 $(man1)skill.1 $(man1)kill.1 \
$(man1)snice.1 $(man1)pgrep.1 $(man1)pkill.1 \ $(man1)snice.1 $(man1)pgrep.1 $(man1)pkill.1 \
@ -59,7 +57,7 @@ MANFILES := $(man1)uptime.1 $(man1)tload.1 $(man1)free.1 $(man1)w.1 \
TARFILES := AUTHORS BUGS NEWS README TODO COPYING COPYING.LIB ChangeLog \ TARFILES := AUTHORS BUGS NEWS README TODO COPYING COPYING.LIB ChangeLog \
Makefile Makefile.noam procps.lsm procps.spec v t README.top \ Makefile Makefile.noam procps.lsm procps.spec v t README.top \
minimal.c $(notdir $(SCRFILES)) $(notdir $(MANFILES)) \ minimal.c $(notdir $(MANFILES)) \
uptime.c tload.c free.c w.c top.c vmstat.c watch.c skill.c \ uptime.c tload.c free.c w.c top.c vmstat.c watch.c skill.c \
sysctl.c pgrep.c top.h sysctl.c pgrep.c top.h
@ -89,7 +87,7 @@ CLEAN := $(notdir $(BINFILES))
DIRS := DIRS :=
INSTALL := $(BINFILES) $(MANFILES) # $(SCRFILES) INSTALL := $(BINFILES) $(MANFILES)
# want this rule first, use := on ALL, and ALL not filled in yet # want this rule first, use := on ALL, and ALL not filled in yet
all: do_all all: do_all
@ -132,9 +130,6 @@ clean:
$(BINFILES) : all $(BINFILES) : all
$(install) --mode a=rx --strip $(notdir $@) $@ $(install) --mode a=rx --strip $(notdir $@) $@
$(SCRFILES) : all
$(install) --mode a=rx $(notdir $@) $@
$(MANFILES) : all $(MANFILES) : all
$(install) --mode a=r $(notdir $@) $@ $(install) --mode a=r $(notdir $@) $@

5
NEWS
View File

@ -1,3 +1,8 @@
procps-3.0.4 --> procps-3.0.5
top tolerates super-wide displays
better (?) RPM generation
procps-3.0.3 --> procps-3.0.4 procps-3.0.3 --> procps-3.0.4
make top go faster make top go faster

View File

@ -1,5 +0,0 @@
#!/bin/sh
# xconsole is capable of doing everything XConsole did, and is maintained...
# it is not setuid root, so we just exit if called as non-root
[ $(id -u) = 0 ] || exit 0
exec xconsole -file /proc/kmsg "$@"

View File

@ -1,15 +1,15 @@
Begin4 Begin4
Title: procps Title: procps
Version: 3.0.4 Version: 3.0.5
Entered-date: 2002-10-15 Entered-date: 2002-10-20
Description: Linux system utilities Description: Linux system utilities
Keywords: procps /proc libproc sysctl Keywords: procps /proc libproc sysctl
ps uptime tload free w top vmstat watch skill snice kill pgrep pkill ps uptime tload free w top vmstat watch skill snice kill pgrep pkill
Author: Albert Cahalan, Michael K. Johnson, Jim Warner, etc. Author: Albert Cahalan, Michael K. Johnson, Jim Warner, etc.
Maintained-by: various <procps-feedback@lists.sf.net> Maintained-by: various <procps-feedback@lists.sf.net>
Primary-site: http://procps.sf.net/ Primary-site: http://procps.sf.net/
230kB procps-3.0.4.tar.gz 230kB procps-3.0.5.tar.gz
Alternate-site: http://www.debian.org/Packages/unstable/base/procps.html Alternate-site: http://www.debian.org/Packages/unstable/base/procps.html
230kB procps-3.0.4.tar.gz 230kB procps-3.0.5.tar.gz
Copying-policy: mixed Copying-policy: mixed
End End

View File

@ -1,59 +1,29 @@
Summary: Utilities for monitoring your system and processes on your system. Summary: System and process monitoring utilities
Name: procps Name: procps
%define major_version 3 %define major_version 3
%define minor_version 0 %define minor_version 0
%define revision 4 %define revision 5
%define version %{major_version}.%{minor_version}.%{revision} %define version %{major_version}.%{minor_version}.%{revision}
Version: %{version} Version: %{version}
Release: 1 Release: 1
Copyright: GPL Copyright: GPL
Group: Applications/System Group: Applications/System
Source: ftp://people.redhat.com/johnsonm/procps/procps-%{version}.tar.gz Source: http://procps.sf.net/procps-%{version}.tar.gz
BuildRoot: /var/tmp/procps-root BuildRoot: /tmp/procps-root
%package X11
Group: Applications/System
Summary: X based process monitoring utilities.
%description %description
The procps package contains a set of system utilities which provide The procps package contains a set of system utilities which provide
system information. Procps includes ps, free, sysctl, skill, snice, system information. Procps includes ps, free, sysctl, skill, snice,
tload, top, uptime, vmstat, w, and watch. The ps command displays tload, top, uptime, vmstat, w, and watch. You need some of these.
a snapshot of running processes. The top command provides a
repetitive update of the statuses of running processes. The free
command displays the amounts of free and used memory on your system.
Sysctl is a simple program for managing system configuration entries.
The skill command sends a terminate command (or another
specified signal) to a specified set of processes. The snice
command is used to change the scheduling priority of specified
processes. The tload command prints a graph of the current system
load average to a specified tty. The uptime command displays the
current time, how long the system has been running, how many users
are logged on and system load averages for the past one, five and
fifteen minutes. The w command displays a list of the users who
are currently logged on and what they're running. The watch program
watches a running program. The vmstat command displays virtual
memory statistics about processes, memory, paging, block I/O, traps
and CPU activity.
%description X11
The procps-X11 package contains the XConsole shell script, a backwards
compatibility wrapper for the xconsole program.
%prep %prep
%setup %setup
%build %build
PATH=/usr/X11R6/bin:$PATH
make CC="gcc $RPM_OPT_FLAGS" LDFLAGS=-s make CC="gcc $RPM_OPT_FLAGS" LDFLAGS=-s
%install %install
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/bin $RPM_BUILD_ROOT/usr/bin $RPM_BUILD_ROOT/sbin
mkdir -p $RPM_BUILD_ROOT/usr/man/man1 $RPM_BUILD_ROOT/usr/man/man8
mkdir -p $RPM_BUILD_ROOT/lib $RPM_BUILD_ROOT/usr/X11R6/bin
make DESTDIR=$RPM_BUILD_ROOT install=install install make DESTDIR=$RPM_BUILD_ROOT install=install install
%clean %clean
@ -62,20 +32,14 @@ rm -rf $RPM_BUILD_ROOT
%post %post
# add libproc to the cache # add libproc to the cache
/sbin/ldconfig /sbin/ldconfig
# remove obsolete files
rm -f /etc/psdevtab /etc/psdatabase
%files %files
%defattr(0644,root,root,755) %defattr(0644,root,root,755)
%attr(0644,root,root) %config(missingok) /etc/X11/applnk/Utilities/top.desktop %doc NEWS BUGS TODO COPYING COPYING.LIB README.top README
%doc NEWS BUGS TODO %attr(555,root,root) /lib/libproc.so*
%attr(755,root,root) /lib/libproc.so.3.0.? %attr(555,root,root) /bin/*
%attr(555,root,root) /bin/ps %attr(555,root,root) /sbin/*
%attr(555,root,root) /sbin/sysctl
%attr(555,root,root) /usr/bin/* %attr(555,root,root) /usr/bin/*
%attr(0644,root,root) /usr/man/man1/* %attr(0644,root,root) /usr/man/man1/*
%attr(0644,root,root) /usr/man/man8/* %attr(0644,root,root) /usr/man/man8/*
%files X11
%attr(0755,root,root) /usr/X11R6/bin/XConsole

View File

@ -1,6 +0,0 @@
[Desktop Entry]
Name=Top
Type=Application
Comment=Repeatedly display processes by CPU time, memory usage, etc.
Exec=top
Terminal=true