X-Git-Url: https://git.tld-linux.org/?p=packages%2Fmksh.git;a=blobdiff_plain;f=mksh.spec;h=513a6555a3dd5a7c8db031f388b4e97c2bce05dc;hp=5eff6c15a0ef9bd4c671f08a1dae0d90a318166b;hb=d7634fca1c726c672daab14db9e474a97594bfe1;hpb=5a2b33e1e24f11b9ead84554444f9210d1b85211

diff --git a/mksh.spec b/mksh.spec
index 5eff6c1..513a655 100644
--- a/mksh.spec
+++ b/mksh.spec
@@ -1,32 +1,29 @@
 #
-# TODO: https://bugs.launchpad.net/mksh/+bug/1179287
-#
 # Conditional build:
+%bcond_with	lto	# enable link time optimisations (breaks tests)
 %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
+Version:	56c
 Release:	1
 License:	BSD
 Group:		Applications/Shells
-Source0:	http://www.mirbsd.org/MirOS/dist/mir/mksh/%{name}-R%{version}.tgz
-# Source0-md5:	71c7cbcd78306897801b8b6691091e66
+Source0:	https://www.mirbsd.org/MirOS/dist/mir/mksh/%{name}-R%{version}.tgz
+# Source0-md5:	4799a9ac6d55871d79ba66713d928663
 Source1:	%{name}-mkshrc
+Source2:	get-source.sh
 Patch0:		%{name}-mkshrc_support.patch
 Patch1:		%{name}-circumflex.patch
-Patch2:		%{name}-no_stop_alias.patch
-Patch3:		%{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,24 +78,21 @@ 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
-mv mksh/* .; rmdir mksh
+%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
 sed -i -e 's|\(@(#)MIRBSD KSH.*\)|\1 @DISTRO@|g' check.t
 
 # fill distro
-sed -i -e 's#@DISTRO@#PLD/Linux 3.0#g' check.t sh.h
+sed -i -e 's#@DISTRO@#TLD/Linux#g' check.t sh.h
 # sanity checks
-grep PLD/Linux check.t || exit 1
-grep PLD/Linux sh.h || exit 1
+grep TLD/Linux check.t || exit 1
+grep TLD/Linux sh.h || exit 1
 
 # we'll need this later due to -DMKSH_GCC55009
 cat >rtchecks <<'EOF'
@@ -142,7 +136,7 @@ CC="%{__cc}" \
 CFLAGS="%{rpmcflags} -DMKSH_GCC55009" \
 LDFLAGS="%{rpmldflags}" \
 CPPFLAGS="%{rpmcppflags}" \
-sh ./Build.sh -Q -r -j -c lto
+sh ./Build.sh -Q -r -j %{?with_lto:-c lto}
 
 # skip some tests if not on terminal
 if ! tty -s; then
@@ -165,7 +159,7 @@ CC="%{__cc}" \
 CFLAGS="%{rpmcflags} -DMKSH_GCC55009" \
 LDFLAGS="%{rpmldflags} -static" \
 CPPFLAGS="%{rpmcppflags}" \
-sh ./Build.sh -Q -r -j -c lto
+sh ./Build.sh -Q -r -j %{?with_lto:-c lto}
 
 %if %{with tests}
 ./test.sh -v $skip_tests
@@ -200,11 +194,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