From 78ce37d017a96225c12f3242461d993f22b7dcc0 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Tue, 3 Nov 2020 01:19:04 +0100 Subject: [PATCH] - Upgrade to 59c (#1893414) - Add alternatives switching for ksh (#1879002) --- mksh.spec | 22 ++++++++++++++++++++-- sources | 2 +- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/mksh.spec b/mksh.spec index ce73a07..560406d 100644 --- a/mksh.spec +++ b/mksh.spec @@ -4,8 +4,8 @@ Summary: MirBSD enhanced version of the Korn Shell Name: mksh -Version: 59b -Release: 2%{?dist} +Version: 59c +Release: 1%{?dist} # BSD (setmode.c), ISC (strlcpy.c), MirOS (the rest) License: MirOS and ISC and BSD URL: https://www.mirbsd.org/mksh.htm @@ -14,12 +14,15 @@ Source1: dot-mkshrc Source2: rtchecks.expected %if 0%{?fedora} >= 17 || 0%{?rhel} >= 7 Conflicts: filesystem < 3 +Provides: /bin/ksh Provides: /bin/lksh Provides: /bin/mksh Provides: /bin/rlksh Provides: /bin/rmksh %endif Requires(post): grep +Requires(post): %{_sbindir}/alternatives +Requires(preun): %{_sbindir}/alternatives Requires(postun): sed BuildRequires: gcc BuildRequires: util-linux @@ -87,6 +90,7 @@ ln -s %{name} $RPM_BUILD_ROOT%{_bindir}/rmksh ln -s lksh $RPM_BUILD_ROOT%{_bindir}/rlksh ln -s %{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1/rmksh.1 ln -s lksh.1 $RPM_BUILD_ROOT%{_mandir}/man1/rlksh.1 +touch $RPM_BUILD_ROOT{%{_bindir}/ksh,%{_mandir}/man1/ksh.1} %check ./mksh rtchecks >rtchecks.got 2>&1 @@ -117,6 +121,14 @@ grep -q "^/bin/%{name}$" %{_sysconfdir}/shells 2>/dev/null || \ grep -q "^%{_bindir}/%{name}$" %{_sysconfdir}/shells 2>/dev/null || \ echo "%{_bindir}/%{name}" >> %{_sysconfdir}/shells +%{_sbindir}/alternatives --install %{_bindir}/ksh ksh %{_bindir}/%{name} 10 \ + --slave %{_mandir}/man1/ksh.1.gz ksh-man %{_mandir}/man1/%{name}.1.gz + +%preun +if [ $1 = 0 ]; then + %{_sbindir}/alternatives --remove ksh %{_bindir}/%{name} +fi + %postun if [ ! -x %{_bindir}/%{name} ]; then %if 0%{?fedora} >= 17 || 0%{?rhel} >= 7 @@ -127,18 +139,24 @@ fi %files %doc dot.mkshrc FAQ.htm +%ghost %{_bindir}/ksh %{_bindir}/lksh %{_bindir}/%{name} %{_bindir}/rlksh %{_bindir}/rmksh %config(noreplace) %{_sysconfdir}/mkshrc %config(noreplace) %{_sysconfdir}/skel/.mkshrc +%ghost %{_mandir}/man1/ksh.1* %{_mandir}/man1/lksh.1* %{_mandir}/man1/%{name}.1* %{_mandir}/man1/rlksh.1* %{_mandir}/man1/rmksh.1* %changelog +* Mon Nov 02 2020 Robert Scheck 59c-1 +- Upgrade to 59c (#1893414) +- Add alternatives switching for ksh (#1879002) + * Tue Jul 28 2020 Fedora Release Engineering - 59b-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index f588191..b874173 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mksh-R59b.tgz) = 4ae330a79a09d2dd989116b1a836ab7f179d920eb34c97ea5da7d1434361911a93ba77ca47c5e473e5a5ce1877f2a2e919a807bb6139ec6c89c87969054d021d +SHA512 (mksh-R59c.tgz) = f56b6956f9e1dd88ddce2294301a5eb698050d9d4f49286fdcd8f9df8554eabbcc71d37e2bf3eb7234e3968a17231cc6de8aa7efbf17768834a90b14e8cdf340