[mksh] - Upgrade to 50e - Apply https://fedoraproject.org/wiki/Features/UsrMove

Robert Scheck robert at fedoraproject.org
Thu Mar 19 22:48:00 UTC 2015


commit a8c6b3315934dc5d6765f85e707f187bf170899c
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Thu Mar 19 23:47:54 2015 +0100

    - Upgrade to 50e
    - Apply https://fedoraproject.org/wiki/Features/UsrMove

 mksh.spec | 22 ++++++++++++++++++++--
 sources   |  2 +-
 2 files changed, 21 insertions(+), 3 deletions(-)
---
diff --git a/mksh.spec b/mksh.spec
index 813575e..4fa3943 100644
--- a/mksh.spec
+++ b/mksh.spec
@@ -1,7 +1,10 @@
+%if 0%{?fedora} < 17 && 0%{?rhel} < 7
 %global _bindir   /bin
+%endif
+
 Summary:          MirBSD enhanced version of the Korn Shell
 Name:             mksh
-Version:          50d
+Version:          50e
 Release:          1%{?dist}
 # BSD (setmode.c), ISC (strlcpy.c), MirOS (the rest)
 License:          MirOS and ISC and BSD
@@ -10,6 +13,10 @@ 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
+%if 0%{?fedora} >= 17 || 0%{?rhel} >= 7
+Conflicts:        filesystem < 3
+Provides:         /bin/lksh, /bin/mksh
+%endif
 Requires(post):   grep
 Requires(postun): sed
 BuildRequires:    util-linux, ed
@@ -69,7 +76,7 @@ CFLAGS="$RPM_OPT_FLAGS -DMKSH_DISABLE_EXPERIMENTAL" sh Build.sh -L -r
 %else
 CFLAGS="$RPM_OPT_FLAGS -DMKSH_DISABLE_EXPERIMENTAL" sh Build.sh -L -r -c lto
 %endif
-cp test.sh test_lksh.sh
+cp -f test.sh test_lksh.sh
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -102,11 +109,18 @@ do
 done
 
 %post
+%if 0%{?fedora} >= 17 || 0%{?rhel} >= 7
+grep -q "^/bin/%{name}$" %{_sysconfdir}/shells 2>/dev/null || \
+  echo "/bin/%{name}" >> %{_sysconfdir}/shells
+%endif
 grep -q "^%{_bindir}/%{name}$" %{_sysconfdir}/shells 2>/dev/null || \
   echo "%{_bindir}/%{name}" >> %{_sysconfdir}/shells
 
 %postun
 if [ ! -x %{_bindir}/%{name} ]; then
+%if 0%{?fedora} >= 17 || 0%{?rhel} >= 7
+  sed -e 's@^/bin/%{name}$@POSTUNREMOVE@' -e '/^POSTUNREMOVE$/d' -i %{_sysconfdir}/shells
+%endif
   sed -e 's@^%{_bindir}/%{name}$@POSTUNREMOVE@' -e '/^POSTUNREMOVE$/d' -i %{_sysconfdir}/shells
 fi
 
@@ -124,6 +138,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/lksh.1*
 
 %changelog
+* Thu Mar 19 2015 Robert Scheck <robert at fedoraproject.org> 50e-1
+- Upgrade to 50e
+- Apply https://fedoraproject.org/wiki/Features/UsrMove
+
 * Wed Oct 08 2014 Robert Scheck <robert at fedoraproject.org> 50d-1
 - Upgrade to 50d (#1150493)
 
diff --git a/sources b/sources
index 2ac457a..cafa88c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1c3882c07a760b23df1ad94ad0b4ed2e  mksh-R50d.tgz
+5f0bd21e64aabef4ac64d95a95e1b727  mksh-R50e.tgz


More information about the scm-commits mailing list