SPECS: bash.spec - more readable scriptlet lua

glen glen at pld-linux.org
Wed Jun 25 14:45:34 CEST 2008


Author: glen                         Date: Wed Jun 25 12:45:34 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- more readable scriptlet lua

---- Files affected:
SPECS:
   bash.spec (1.189 -> 1.190) 

---- Diffs:

================================================================
Index: SPECS/bash.spec
diff -u SPECS/bash.spec:1.189 SPECS/bash.spec:1.190
--- SPECS/bash.spec:1.189	Wed Jun 25 13:41:18 2008
+++ SPECS/bash.spec	Wed Jun 25 14:45:29 2008
@@ -45,7 +45,7 @@
 BuildRequires:	bison
 BuildRequires:	ncurses-devel >= 5.2
 BuildRequires:	readline-devel >= 5.2
-BuildRequires:	rpmbuild(macros) >= 1.429
+BuildRequires:	rpmbuild(macros) >= 1.462
 BuildRequires:	sed >= 4.0
 BuildRequires:	texinfo
 %if %{with static}
@@ -260,16 +260,25 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post	-p %add_etc_shells -p /bin/sh /bin/ksh
+%post	-p <lua>
+%lua_add_etc_shells /bin/bash /bin/rbash
 os.execute("/usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1")
 
-%preun	-p %remove_etc_shells -p /bin/bash /bin/rbash
+%preun	-p <lua>
+if arg[2] == 0 then
+	%lua_remove_etc_shells /bin/bash /bin/rbash
+end
 
 %postun	-p	/sbin/postshell
 -/usr/sbin/fix-info-dir -c %{_infodir}
 
-%post static -p %add_etc_shells -p /bin/bash.static
-%preun static -p %remove_etc_shells -p /bin/bash.static
+%post static -p <lua>
+%lua_add_etc_shells /bin/bash.static
+
+%preun static -p <lua>
+if arg[2] == 0 then
+	%lua_remove_etc_shells /bin/bash.static
+end
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
@@ -307,6 +316,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.190  2008/06/25 12:45:29  glen
+- more readable scriptlet lua
+
 Revision 1.189  2008/06/25 11:41:18  glen
 - drop bashbug, kills /bin/sh dep from package
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/bash.spec?r1=1.189&r2=1.190&f=u



More information about the pld-cvs-commit mailing list