From 9e6b678e30e36bb2d273f583a467343b325091d9 Mon Sep 17 00:00:00 2001
From: pius <pius@pld-linux.org>
Date: Fri, 3 Sep 1999 20:29:20 +0000
Subject: [PATCH] - updated to 2.0.3, - added top.desktop instead of wmconfig
 file, - added new entries in %files, - simplifications in %install, -
 cosmetics.

Changed files:
    procps.spec -> 1.28
---
 procps.spec | 44 ++++++++++++++++++++++++--------------------
 1 file changed, 24 insertions(+), 20 deletions(-)

diff --git a/procps.spec b/procps.spec
index f3ab8d4..ab1630b 100644
--- a/procps.spec
+++ b/procps.spec
@@ -4,8 +4,8 @@ Summary(fr):	Utilitaires de surveillance des processus.
 Summary(pl):	Narzêdzia do monitorowania procesów
 Summary(tr):	Süreç izleme araçlarý
 Name:		procps
-Version:	2.0.2
-Release:	4
+Version:	2.0.3
+Release:	1
 Copyright:	GPL
 Group:		Utilities/System
 Group(pl):	Narzêdzia/System
@@ -13,6 +13,7 @@ Source0:	ftp://tsx-11.mit.edu/pub/linux/sources/usr.bin/%{name}-%{version}.tar.g
 Source1:	free.1.pl
 Source2:	uptime.1.pl
 Source3:	ps.1.pl
+Source4:	top.desktop
 Patch0:		procps-opt.patch
 Patch1:		procps-install.patch
 Patch2:		procps-w.patch
@@ -21,6 +22,8 @@ URL:		http://www.cs.uml.edu/~acahalan/linux/
 Obsoletes:	procps-X11
 Buildroot:	/tmp/%{name}-%{version}-root
 
+%define		_sysconfdir	/etc/X11
+
 %description
 A package of utilities which report on the state of the system,
 including the states of running processes, amount of memory available,
@@ -38,7 +41,7 @@ et les utilisateurs logg
 
 %description -l pl
 Pakiet zawiera podstawowe narzêdzia do monitorowania pracy systemu. Dziêki
-tym programom bêdziesz móg³ na bie¿±co kontralowaæ jakie procesy s± w danej
+tym programom bêdziesz móg³ na bie¿±co kontrolowaæ jakie procesy s± w danej
 chwili uruchomione, ilo¶æ wolnej pamiêci, kto jest w danej chwili zalogowany,
 jakie jest aktualne obci±¿enie systemu itp.
 
@@ -61,36 +64,36 @@ make OPT="$RPM_OPT_FLAGS -pipe"
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT/{etc/X11/wmconfig,bin,lib} \
-	$RPM_BUILD_ROOT/usr/{bin,X11R6/bin,share}
-
-install -d $RPM_BUILD_ROOT%{_mandir}/{man{1,8},pl/man1}
+install -d $RPM_BUILD_ROOT/{bin,sbin,lib,usr/X11R6/bin} \
+	$RPM_BUILD_ROOT{%{_bindir},%{_datadir},%{_mandir}/{man{1,8},pl/man1}} \
+	$RPM_BUILD_ROOT%{_sysconfdir}/applnk/Administration
 
 make install \
 	DESTDIR=$RPM_BUILD_ROOT BINGRP=`id -g` \
 	MAN1DIR=$RPM_BUILD_ROOT%{_mandir}/man1 \
 	MAN8DIR=$RPM_BUILD_ROOT%{_mandir}/man8
 
-install top.wmconfig $RPM_BUILD_ROOT/etc/X11/wmconfig/top
-install XConsole $RPM_BUILD_ROOT/usr/X11R6/bin
+install %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/applnk/Administration
+install XConsole   $RPM_BUILD_ROOT/usr/X11R6/bin
 
 rm -f  $RPM_BUILD_ROOT%{_bindir}/snice
 ln -sf skill $RPM_BUILD_ROOT%{_bindir}/snice
-rm -f  $RPM_BUILD_ROOT/bin/kill
 
+rm -f $RPM_BUILD_ROOT/bin/kill
 rm -f $RPM_BUILD_ROOT%{_mandir}/man1/{snice,kill,oldps}.1
 rm -f $RPM_BUILD_ROOT%{_bindir}/{oldps,kill}
 
 echo .so skill.1 > $RPM_BUILD_ROOT%{_mandir}/man1/snice.1
-install ps/ps.1 $RPM_BUILD_ROOT%{_mandir}/man1
-
-strip --strip-unneeded $RPM_BUILD_ROOT/lib/*.so.*.*
+install ps/ps.1    $RPM_BUILD_ROOT%{_mandir}/man1
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/pl/man1/free.1
 install %{SOURCE2} $RPM_BUILD_ROOT%{_mandir}/pl/man1/uptime.1
 install %{SOURCE3} $RPM_BUILD_ROOT%{_mandir}/pl/man1/ps.1
 
-gzip -9fn $RPM_BUILD_ROOT%{_mandir}/{man*/*,pl/man*/*} NEWS BUGS 
+strip --strip-unneeded $RPM_BUILD_ROOT/lib/*.so.*.*
+
+gzip -9fn $RPM_BUILD_ROOT%{_mandir}/{man*/*,pl/man*/*} \
+	NEWS BUGS TODO
 
 %post 
 /sbin/ldconfig
@@ -106,14 +109,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc {NEWS,BUGS}.gz
-
-%lang(pl) %{_mandir}/pl/man*/*
-%{_mandir}/man*/*
-
-/etc/X11/wmconfig/top
+%doc {NEWS,BUGS,TODO}.gz
 
 %attr(755,root,root) /lib/libproc.so.*.*
 %attr(755,root,root) /bin/*
+%attr(755,root,root) /sbin/sysctl
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) /usr/X11R6/bin/XConsole
+
+%lang(pl) %{_mandir}/pl/man*/*
+%{_mandir}/man*/*
+
+%{_sysconfdir}/applnk/Administration/top.desktop
-- 
2.44.0