[packages/pdksh] allow switching back from mksh, trigger included

glen glen at pld-linux.org
Wed Aug 7 23:23:19 CEST 2013


commit 13f4c80513c22daf833fd4736deb52e3d2eccde7
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Thu Aug 8 00:22:36 2013 +0300

    allow switching back from mksh, trigger included

 pdksh.spec | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)
---
diff --git a/pdksh.spec b/pdksh.spec
index 16a5079..e5ed0f0 100644
--- a/pdksh.spec
+++ b/pdksh.spec
@@ -14,7 +14,7 @@ Summary(tr.UTF-8):	Serbest Korn kabuğu
 Summary(uk.UTF-8):	Вілбна реалізація командного процесора Korn shell (ksh)
 Name:		pdksh
 Version:	5.2.14
-Release:	57
+Release:	57.18
 License:	Mostly Public Domain with Free & GPL additions
 Group:		Applications/Shells
 Source0:	ftp://ftp.cs.mun.ca/pub/pdksh/%{name}-%{version}.tar.gz
@@ -34,10 +34,11 @@ Patch14:	%{name}-kshrc_support.patch
 Patch15:	%{name}-openbsd.patch
 URL:		http://www.cs.mun.ca/~michael/pdksh/
 %{?with_static:BuildRequires:	glibc-static}
-BuildRequires:	rpmbuild(macros) >= 1.429
+BuildRequires:	rpmbuild(macros) >= 1.462
 # is needed for /etc directory existence
 Requires(pre):	FHS
 Requires:	setup >= 2.4.6-2
+Obsoletes:	mksh
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_exec_prefix		/
@@ -154,8 +155,13 @@ rm -rf $RPM_BUILD_ROOT
 %post	-p %add_etc_shells -p /bin/sh /bin/ksh
 %preun	-p %remove_etc_shells -p /bin/sh /bin/ksh
 
-%post static -p %add_etc_shells -p /bin/ksh.static
-%preun static -p %remove_etc_shells -p /bin/ksh.static
+%post	static -p %add_etc_shells -p /bin/ksh.static
+%preun	static -p %remove_etc_shells -p /bin/ksh.static
+
+%triggerpostun -p <lua> -- mksh
+if arg[2] ~= 0 then
+%lua_add_etc_shells /bin/sh /bin/ksh
+end
 
 %files
 %defattr(644,root,root,755)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/pdksh.git/commitdiff/13f4c80513c22daf833fd4736deb52e3d2eccde7



More information about the pld-cvs-commit mailing list