- release 4

[packages/mksh.git] / mksh.spec

diff --git a/mksh.spec b/mksh.spec
index 3b637829f93f5313b929da4c6b6a7b571fbaa984..116ce246fd99b7495d5e86f4cfbea087046b6e28 100644 (file)
--- a/mksh.spec
+++ b/mksh.spec
@@ -5,13 +5,17 @@ Summary:      MirBSD Korn Shell
 Summary(pl.UTF-8):     Powłoka Korna z MirBSD
 Name:          mksh
 Version:       40
-Release:       1
+Release:       4
 License:       BSD
 Group:         Applications/Shells
 Source0:       http://www.mirbsd.org/MirOS/dist/mir/mksh/%{name}-R%{version}.cpio.gz
 # Source0-md5: 395a6c5f39c7e2afd8f6504d90ca90bd
 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
 URL:           https://www.mirbsd.org/mksh.htm
 %if %{with tests}
 BuildRequires: ed
@@ -70,7 +74,7 @@ mksh to pochodząca z MirBSD rozszerzona wersja powłoki Public Domain
 Korn Shell (pdksh) - kompatybilnej z powłoką Bourne'a, w większości
 zbliżonej do oryginalnej powłoki Korna z AT&T.
 
-W tym pakiecie jest mkksh skonsolidowany statycznie.
+W tym pakiecie jest mksh skonsolidowany statycznie.
 
 %prep
 %setup -qcT
@@ -78,6 +82,10 @@ gzip -dc %{SOURCE0} | cpio -mid
 mv mksh/* .; rmdir mksh
 
 %patch0 -p0
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 %build
 install -d out
@@ -87,7 +95,12 @@ CFLAGS="%{rpmcppflags} %{rpmcflags}" \
 LDFLAGS="%{rpmldflags}" \
 sh ./Build.sh -Q -r -j
 
-%{?with_tests:./test.sh -v}
+# skip some tests if not on terminal
+if ! tty -s; then
+       skip_tests="-C regress:no-ctty"
+fi
+
+%{?with_tests:./test.sh -v $skip_tests}
 mv mksh out/mksh.dynamic
 
 %if %{with static}
@@ -96,12 +109,10 @@ CFLAGS="%{rpmcppflags} %{rpmcflags}" \
 LDFLAGS="%{rpmldflags} -static" \
 sh ./Build.sh -Q -r -j
 
-%{?with_tests:./test.sh -v}
+%{?with_tests:./test.sh -v $skip_tests}
 mv mksh out/mksh.static
 %endif
 
-ln -sf mksh $RPM_BUILD_ROOT/bin/sh
-
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1}
@@ -112,6 +123,10 @@ cp -a mksh.1 $RPM_BUILD_ROOT%{_mandir}/man1/mksh.1
 echo ".so mksh.1" > $RPM_BUILD_ROOT%{_mandir}/man1/sh.1
 
 install -D %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/mkshrc
+ln -sf mksh $RPM_BUILD_ROOT%{_bindir}/sh
+
+# some pdksh scripts used that
+ln -sf mksh $RPM_BUILD_ROOT%{_bindir}/ksh
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -119,6 +134,8 @@ 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
 
+%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
 
@@ -127,6 +144,8 @@ rm -rf $RPM_BUILD_ROOT
 %doc dot.mkshrc
 %config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/mkshrc
 %attr(755,root,root) %{_bindir}/mksh
+%attr(755,root,root) %{_bindir}/ksh
+%attr(755,root,root) %{_bindir}/sh
 %{_mandir}/man1/mksh.1*
 %{_mandir}/man1/sh.1*