manually merge changes from mksh-44 branch

[packages/mksh.git] / mksh.spec

diff --git a/mksh.spec b/mksh.spec
index dcb7768f6b01bdcbdcbcbc0e0ca48723b080d6b0..16bad2a1fee017d2f78684806ef29e95bed3ec1a 100644 (file)
--- a/mksh.spec
+++ b/mksh.spec
@@ -1,4 +1,6 @@
 #
+# TODO: https://bugs.launchpad.net/mksh/+bug/1179287
+#
 # Conditional build:
 %bcond_without static  # static version of mksh
 %bcond_without tests   # rtchecks and test.sh checks
@@ -7,12 +9,12 @@
 Summary:       MirBSD Korn Shell
 Summary(pl.UTF-8):     Powłoka Korna z MirBSD
 Name:          mksh
-Version:       45
+Version:       47
 Release:       1
 License:       BSD
 Group:         Applications/Shells
 Source0:       http://www.mirbsd.org/MirOS/dist/mir/mksh/%{name}-R%{version}.tgz
-# Source0-md5: d3d90973119ae689d5300b690600e1dc
+# Source0-md5: 71c7cbcd78306897801b8b6691091e66
 Source1:       %{name}-mkshrc
 Patch0:                %{name}-mkshrc_support.patch
 Patch1:                %{name}-circumflex.patch
@@ -24,7 +26,7 @@ BuildRequires:        ed
 BuildRequires: perl-base
 %endif
 %{?with_static:BuildRequires:   glibc-static}
-BuildRequires: rpmbuild(macros) >= 1.462
+BuildRequires: rpmbuild(macros) >= 1.670
 # is needed for /etc directory existence
 Requires(pre): FHS
 Requires:      setup >= 2.4.6-2
@@ -151,7 +153,7 @@ fi
 ./mksh rtchecks >rtchecks.got 2>&1
 if ! cmp --quiet rtchecks.got rtchecks.expected ; then
        echo "rtchecks failed"
-       diff -Naurp %{SOURCE3} rtchecks.got
+       diff -Naurp rtchecks.expected rtchecks.got
        exit 1
 fi
 ./test.sh -v $skip_tests
@@ -198,8 +200,7 @@ rm -rf $RPM_BUILD_ROOT
 %post   -p %add_etc_shells -p /bin/sh /bin/ksh /bin/mksh
 %preun  -p %remove_etc_shells -p /bin/sh /bin/ksh /bin/mksh
 
-%posttrans -p %add_etc_shells -p /bin/sh /bin/ksh
-
+%posttrans -p %add_etc_shells -p /bin/sh /bin/ksh /bin/mksh
 
 %post  static -p %add_etc_shells -p /bin/mksh.static
 %preun static -p %remove_etc_shells -p /bin/mksh.static