packages: lshell/lshell.spec - use common /etc/shell modify

glen glen at pld-linux.org
Mon Mar 15 00:19:18 CET 2010


Author: glen                         Date: Sun Mar 14 23:19:18 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- use common /etc/shell modify

---- Files affected:
packages/lshell:
   lshell.spec (1.8 -> 1.9) 

---- Diffs:

================================================================
Index: packages/lshell/lshell.spec
diff -u packages/lshell/lshell.spec:1.8 packages/lshell/lshell.spec:1.9
--- packages/lshell/lshell.spec:1.8	Mon Mar 15 00:17:38 2010
+++ packages/lshell/lshell.spec	Mon Mar 15 00:19:13 2010
@@ -11,7 +11,7 @@
 URL:		http://lshell.ghantoos.org
 BuildRequires:	python-devel
 BuildRequires:	rpm-pythonprov
-BuildRequires:	rpmbuild(macros) >= 1.219
+BuildRequires:	rpmbuild(macros) >= 1.462
 Requires:	python-modules
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -42,21 +42,14 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-umask 022
-[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} > /dev/null 2>&1
-if [ ! -f /etc/shells ]; then
-	echo "%{_bindir}/lshell" >> /etc/shells
-else
-	grep -q '^%{_bindir}/lshell$' /etc/shells || echo "%{_bindir}/lshell" >> /etc/shells
-fi
-
-%preun
-if [ "$1" = "0" ]; then
-	umask 022
-	grep -v '^%{_bindir}/lshell$' /etc/shells > /etc/shells.new
-	mv -f /etc/shells.new /etc/shells
-fi
+%post	-p <lua>
+%lua_add_etc_shells %{_bindir}/lshell
+os.execute("/usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1")
+
+%preun	-p <lua>
+if arg[2] == 0 then
+	%lua_remove_etc_shells %{_bindir}/lshell
+end
 
 %postun	-p	/sbin/postshell
 -/usr/sbin/fix-info-dir -c %{_infodir}
@@ -79,6 +72,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2010/03/14 23:19:13  glen
+- use common /etc/shell modify
+
 Revision 1.8  2010/03/14 23:17:38  glen
 - pldize
 - do not package random paths with a glob (like logrotate dir!)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lshell/lshell.spec?r1=1.8&r2=1.9&f=u



More information about the pld-cvs-commit mailing list