- up to 40d

[packages/mksh.git] / mksh.spec

diff --git a/mksh.spec b/mksh.spec
index 8be333d78d3e311671f394f4c126ae771fcdb392..2ef7b0225b168cb23f80f3e18562aae9a685b77c 100644 (file)
--- a/mksh.spec
+++ b/mksh.spec
@@ -4,18 +4,18 @@
 Summary:       MirBSD Korn Shell
 Summary(pl.UTF-8):     Powłoka Korna z MirBSD
 Name:          mksh
-Version:       40
-Release:       2
+Version:       40d
+Release:       1
 License:       BSD
 Group:         Applications/Shells
 Source0:       http://www.mirbsd.org/MirOS/dist/mir/mksh/%{name}-R%{version}.cpio.gz
-# Source0-md5: 395a6c5f39c7e2afd8f6504d90ca90bd
+# Source0-md5: c6428401103367730a95b99284bf47dc
 Source1:       %{name}-mkshrc
 Patch0:                %{name}-mkshrc_support.patch
 Patch1:                %{name}-circumflex.patch
 Patch2:                %{name}-no_stop_alias.patch
-Patch3:                %{name}-tty.patch
-Patch4:                %{name}-test.patch
+Patch3:                %{name}-distro.patch
+Patch4:                %{name}-cmdline-length.patch
 URL:           https://www.mirbsd.org/mksh.htm
 %if %{with tests}
 BuildRequires: ed
@@ -87,33 +87,31 @@ mv mksh/* .; rmdir mksh
 %patch3 -p1
 %patch4 -p1
 
+sed -i -e 's#@DISTRO@#PLD/Linux 3.0#g' check.t sh.h
+
 %build
 install -d out
 
 CC="%{__cc}" \
 CFLAGS="%{rpmcppflags} %{rpmcflags}" \
 LDFLAGS="%{rpmldflags}" \
-sh ./Build.sh -Q -r -j
+sh ./Build.sh -Q -r -j -c lto
 
 # skip some tests if not on terminal
 if ! tty -s; then
-do_tests=$(awk '
-/^---/ { if (need_ctty == 0) { print name; }; need_ctty=0; }
-/^name:/ { name=$2; }
-/^need-ctty:/ { need_ctty=1; }
-' check.t)
+       skip_tests="-C regress:no-ctty"
 fi
 
-%{?with_tests:./test.sh -v $do_tests}
+%{?with_tests:./test.sh -v $skip_tests}
 mv mksh out/mksh.dynamic
 
 %if %{with static}
 CC="%{__cc}" \
 CFLAGS="%{rpmcppflags} %{rpmcflags}" \
 LDFLAGS="%{rpmldflags} -static" \
-sh ./Build.sh -Q -r -j
+sh ./Build.sh -Q -r -j -c lto
 
-%{?with_tests:./test.sh -v $do_tests}
+%{?with_tests:./test.sh -v $skip_tests}
 mv mksh out/mksh.static
 %endif
 
@@ -135,10 +133,11 @@ ln -sf mksh $RPM_BUILD_ROOT%{_bindir}/ksh
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post   -p %add_etc_shells -p /bin/sh /bin/mksh
-%preun  -p %remove_etc_shells -p /bin/sh /bin/mksh
+%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
 
-%posttrans -p %add_etc_shells -p /bin/sh
 
 %post static -p %add_etc_shells -p /bin/mksh.static
 %preun static -p %remove_etc_shells -p /bin/mksh.static