SPECS: procps.spec - psdevtab, psdatabase are gone, remove /bin/sh dep from...

glen glen at pld-linux.org
Wed May 28 19:28:22 CEST 2008


Author: glen                         Date: Wed May 28 17:28:22 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- psdevtab, psdatabase are gone, remove /bin/sh dep from package; rel 4

---- Files affected:
SPECS:
   procps.spec (1.127 -> 1.128) 

---- Diffs:

================================================================
Index: SPECS/procps.spec
diff -u SPECS/procps.spec:1.127 SPECS/procps.spec:1.128
--- SPECS/procps.spec:1.127	Wed May 28 05:52:37 2008
+++ SPECS/procps.spec	Wed May 28 19:28:16 2008
@@ -1,6 +1,4 @@
 # $Revision$, $Date$
-# TODO
-# - isn't /etc/psdevtab & /etc/psdatabase obsolete? if not package as ghost
 Summary:	Utilities for monitoring your system and processes on your system
 Summary(de.UTF-8):	Utilities zum Ueberwachen Ihres Systems und der Prozesse
 Summary(es.UTF-8):	Utilitarios de monitoración de procesos
@@ -10,7 +8,7 @@
 Summary(tr.UTF-8):	Süreç izleme araçları
 Name:		procps
 Version:	3.2.7
-Release:	3
+Release:	4
 Epoch:		1
 License:	GPL
 Group:		Applications/System
@@ -28,6 +26,7 @@
 Patch3:		%{name}-selinux.patch
 URL:		http://procps.sourceforge.net/
 BuildRequires:	ncurses-devel >= 5.1
+BuildRequires:	rpmbuild(macros) >= 1.402
 Requires(post):	/sbin/ldconfig
 Requires:	fileutils
 Obsoletes:	procps-X11
@@ -162,11 +161,9 @@
 install %{SOURCE4} $RPM_BUILD_ROOT%{_bindir}/XConsole
 
 rm -f $RPM_BUILD_ROOT/bin/kill
-rm -f $RPM_BUILD_ROOT%{_mandir}/man1/{snice,kill,oldps}.1
+rm -f $RPM_BUILD_ROOT%{_mandir}/man1/{kill,oldps}.1
 rm -f $RPM_BUILD_ROOT%{_bindir}/{oldps,kill}
 
-echo ".so skill.1" > $RPM_BUILD_ROOT%{_mandir}/man1/snice.1
-
 bzcat -dc %{SOURCE1} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
 rm -f $RPM_BUILD_ROOT%{_mandir}/*/man1/{kill,oldps}.1
 rm -f $RPM_BUILD_ROOT%{_mandir}/README-procps-non-english-man-pages
@@ -174,14 +171,7 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-/sbin/ldconfig
-# ask ps to set up /etc/psdevtab if /proc is mounted
-if [ -f /proc/uptime ]; then
-	/bin/ps </dev/null >/dev/null 2>&1
-fi
-rm -f %{_sysconfdir}/psdevtab %{_sysconfdir}/psdatabase
-
+%post	-p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
 %files
@@ -221,6 +211,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.128  2008-05-28 17:28:16  glen
+- psdevtab, psdatabase are gone, remove /bin/sh dep from package; rel 4
+
 Revision 1.127  2008-05-28 03:52:37  glen
 - release 3
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/procps.spec?r1=1.127&r2=1.128&f=u



More information about the pld-cvs-commit mailing list