SPECS: sudosh.spec - correct scriptlet deps, unify

glen glen at pld-linux.org
Thu Jun 1 01:10:43 CEST 2006


Author: glen                         Date: Wed May 31 23:10:43 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- correct scriptlet deps, unify

---- Files affected:
SPECS:
   sudosh.spec (1.22 -> 1.23) 

---- Diffs:

================================================================
Index: SPECS/sudosh.spec
diff -u SPECS/sudosh.spec:1.22 SPECS/sudosh.spec:1.23
--- SPECS/sudosh.spec:1.22	Wed Oct 19 10:06:44 2005
+++ SPECS/sudosh.spec	Thu Jun  1 01:10:38 2006
@@ -10,12 +10,13 @@
 Source0:	http://dl.sourceforge.net/sudosh/%{name}-%{version}.tar.gz
 # Source0-md5:	700ee8c6060c1512ac0c2731b5727cc6
 URL:		http://sourceforge.net/projects/sudosh/
-Requires(post,preun):	sed >= 4.0
+Requires(preun):	sed >= 4.0
 Requires(post):	grep
 Requires:	sudo
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_bindir		/bin
+%define		_shell		%{_bindir}/%{name}
 
 %description
 sudosh is a filter that takes advantage of PTY devices in order to sit
@@ -58,14 +59,14 @@
 %post
 if [ ! -f /etc/shells ]; then
 	umask 022
-	echo '%{_bindir}/sudosh' >> /etc/shells
+	echo '%{_shell}' > /etc/shells
 else
-	grep -q '^%{_bindir}/sudosh$' /etc/shells || echo '%{_bindir}/sudosh' >> /etc/shells
+	grep -q '^%{_shell}$' /etc/shells || echo '%{_shell}' >> /etc/shells
 fi
 
 %preun
 if [ "$1" = "0" ]; then
-	sed -i -e '/^%(echo %{_bindir} | sed -e 's,/,\\/,g')\/sudosh$/d' /etc/shells
+	%{__sed} -i -e '/^%(echo %{_shell} | sed -e 's,/,\\/,g')$/d' /etc/shells
 fi
 
 %files
@@ -81,6 +82,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.23  2006/05/31 23:10:38  glen
+- correct scriptlet deps, unify
+
 Revision 1.22  2005/10/19 08:06:44  glen
 - reverted *unstable* 1.8.x is on DEVEL. please read changelog
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/sudosh.spec?r1=1.22&r2=1.23&f=u



More information about the pld-cvs-commit mailing list