- PLD merge

[packages/mksh.git] / mksh.spec

diff --git a/mksh.spec b/mksh.spec
index 5d468cd6e27be3e749c2f799700688d465f4d014..7114292122b1dea52200c880cb2c2ee90e0b3362 100644 (file)
--- a/mksh.spec
+++ b/mksh.spec
@@ -1,32 +1,27 @@
 #
-# TODO: https://bugs.launchpad.net/mksh/+bug/1179287
-#
 # Conditional build:
 %bcond_without static  # static version of mksh
 %bcond_without tests   # rtchecks and test.sh checks
-#
-#
+
 Summary:       MirBSD Korn Shell
 Summary(pl.UTF-8):     Powłoka Korna z MirBSD
 Name:          mksh
-Version:       47
-Release:       3
+Version:       52c
+Release:       1
 License:       BSD
 Group:         Applications/Shells
 Source0:       http://www.mirbsd.org/MirOS/dist/mir/mksh/%{name}-R%{version}.tgz
-# Source0-md5: 71c7cbcd78306897801b8b6691091e66
+# Source0-md5: cc3884e02314447e7b4a3073b8d65d1e
 Source1:       %{name}-mkshrc
 Patch0:                %{name}-mkshrc_support.patch
-Patch1:                %{name}-circumflex.patch
-Patch2:                %{name}-no_stop_alias.patch
-Patch3:                %{name}-cmdline-length.patch
+Patch1:                %{name}-cmdline-length.patch
 URL:           https://www.mirbsd.org/mksh.htm
 %if %{with tests}
 BuildRequires: ed
 BuildRequires: perl-base
 %endif
 %{?with_static:BuildRequires:   glibc-static}
-BuildRequires: rpmbuild(macros) >= 1.462
+BuildRequires: rpmbuild(macros) >= 1.670
 # is needed for /etc directory existence
 Requires(pre): FHS
 Requires:      setup >= 2.4.6-2
@@ -81,14 +76,11 @@ zbliżonej do oryginalnej powłoki Korna z AT&T.
 W tym pakiecie jest mksh skonsolidowany statycznie.
 
 %prep
-%setup -qcT
-gzip -dc %{SOURCE0} | cpio -mid
+%setup -qc
 mv mksh/* .; rmdir mksh
 
-%patch0 -p0
+%patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 # sed rules instead of patch (needed update for every release)
 sed -i -e 's|\(#define.*MKSH_VERSION.*\)"|\1 @DISTRO@"|g' sh.h
@@ -200,11 +192,14 @@ rm -rf $RPM_BUILD_ROOT
 %post   -p %add_etc_shells -p /bin/sh /bin/ksh /bin/mksh
 %preun  -p %remove_etc_shells -p /bin/sh /bin/ksh /bin/mksh
 
-%posttrans -p %add_etc_shells -p /bin/sh /bin/ksh /bin/mksh
-
 %post  static -p %add_etc_shells -p /bin/mksh.static
 %preun static -p %remove_etc_shells -p /bin/mksh.static
 
+%triggerpostun -p <lua> -- pdksh
+if arg[2] ~= 0 then
+%lua_add_etc_shells /bin/sh /bin/ksh /bin/mksh
+end
+
 %files
 %defattr(644,root,root,755)
 %doc dot.mkshrc