Upgrade to 59 (#1823973)

This commit is contained in:
Robert Scheck 2020-04-16 02:54:13 +02:00
parent 8605a15661
commit 4edf2063ee
3 changed files with 13 additions and 28 deletions

View File

@ -1,22 +0,0 @@
http://www.mirbsd.org/cvs.cgi/src/bin/mksh/Build.sh.diff?r1=1.752;r2=1.753
--- src/bin/mksh/Build.sh 2020/03/27 10:15:52 1.752
+++ src/bin/mksh/Build.sh 2020/03/27 23:36:23 1.753
@@ -244,7 +244,7 @@ vq() {
rmf() {
for _f in "$@"; do
case $_f in
- *.1|*.ico) ;;
+ *.1|*.faq|*.ico) ;;
*) rm -f "$_f" ;;
esac
done
@@ -651,7 +651,7 @@ oswarn=
ccpc=-Wc,
ccpl=-Wl,
tsts=
-ccpr='|| for _f in ${tcfn}*; do case $_f in *.1|*.ico) ;; *) rm -f "$_f" ;; esac; done'
+ccpr='|| for _f in ${tcfn}*; do case $_f in *.1|*.faq|*.ico) ;; *) rm -f "$_f" ;; esac; done'
# Evil hack
if test x"$TARGET_OS" = x"Android"; then

View File

@ -4,7 +4,7 @@
Summary: MirBSD enhanced version of the Korn Shell
Name: mksh
Version: 58
Version: 59
Release: 1%{?dist}
# BSD (setmode.c), ISC (strlcpy.c), MirOS (the rest)
License: MirOS and ISC and BSD
@ -12,11 +12,12 @@ URL: https://www.mirbsd.org/mksh.htm
Source0: https://www.mirbsd.org/MirOS/dist/mir/%{name}/%{name}-R%{version}.tgz
Source1: dot-mkshrc
Source2: rtchecks.expected
Patch0: mksh-58-faq.patch
%if 0%{?fedora} >= 17 || 0%{?rhel} >= 7
Conflicts: filesystem < 3
Provides: /bin/lksh
Provides: /bin/mksh
Provides: /bin/rlksh
Provides: /bin/rmksh
%endif
Requires(post): grep
Requires(postun): sed
@ -35,7 +36,6 @@ bourne shell replacement, pdksh successor and an alternative to the C shell.
%prep
%setup -q -n %{name}
%patch0 -p3 -b .faq
# we'll need this later
cat >rtchecks <<'EOF'
@ -82,6 +82,8 @@ install -D -m 644 %{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1
install -D -m 644 lksh.1 $RPM_BUILD_ROOT%{_mandir}/man1/lksh.1
install -D -p -m 644 dot.mkshrc $RPM_BUILD_ROOT%{_sysconfdir}/mkshrc
install -D -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/skel/.mkshrc
ln -s %{name} $RPM_BUILD_ROOT%{_bindir}/rmksh
ln -s lksh $RPM_BUILD_ROOT%{_bindir}/rlksh
%check
./mksh rtchecks >rtchecks.got 2>&1
@ -122,14 +124,19 @@ fi
%files
%doc dot.mkshrc FAQ.htm
%{_bindir}/%{name}
%{_bindir}/lksh
%{_bindir}/%{name}
%{_bindir}/rlksh
%{_bindir}/rmksh
%config(noreplace) %{_sysconfdir}/mkshrc
%config(noreplace) %{_sysconfdir}/skel/.mkshrc
%{_mandir}/man1/%{name}.1*
%{_mandir}/man1/lksh.1*
%{_mandir}/man1/%{name}.1*
%changelog
* Wed Apr 15 2020 Robert Scheck <robert@fedoraproject.org> 59-1
- Upgrade to 59 (#1823973)
* Fri Mar 27 2020 Robert Scheck <robert@fedoraproject.org> 58-1
- Upgrade to 58 (#1817981)

View File

@ -1 +1 @@
SHA512 (mksh-R58.tgz) = 711351f8bbe8e44fcf9e7963f8e749938ec3ccb362fafd5350d44593841c2acb6d54ffa115dbb6b83c30865728a4c5274c05feedb063e293361e2830d263d80f
SHA512 (mksh-R59.tgz) = be5009ce8f02eab1392f95d7f85f5aad57b1445684b4fe8cd0284a7d79386170979303ef19f039fdbb53bd2a791f3e3603d2fe57e015fed4cb4a24ab710bcfbb