- Upgrade to 50e

- Apply https://fedoraproject.org/wiki/Features/UsrMove
This commit is contained in:
Robert Scheck 2015-03-19 23:47:54 +01:00
parent 1c16cc41bb
commit a8c6b33159
2 changed files with 21 additions and 3 deletions

View File

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

View File

@ -1 +1 @@
1c3882c07a760b23df1ad94ad0b4ed2e mksh-R50d.tgz 5f0bd21e64aabef4ac64d95a95e1b727 mksh-R50e.tgz