- up to 42b

diff --git a/mksh-distro.patch b/mksh-distro.patch
deleted file mode 100644 (file)
index ed75f40..0000000
--- a/mksh-distro.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- mksh-42/sh.h~      2013-02-12 07:20:52.764918024 +0100
-+++ mksh-42/sh.h       2013-02-12 07:21:57.486460200 +0100
-@@ -166,7 +166,7 @@
- #ifdef EXTERN
- __RCSID("$MirOS: src/bin/mksh/sh.h,v 1.634.2.1 2013/02/11 17:25:03 tg Exp $");
- #endif
--#define MKSH_VERSION "R42 2013/02/10"
-+#define MKSH_VERSION "R42 2013/02/10 @DISTRO@"
- 
- /* arithmetic types: C implementation */
- #if !HAVE_CAN_INTTYPES
---- mksh-42/check.t~   2013-02-11 14:07:19.000000000 +0100
-+++ mksh-42/check.t    2013-02-12 07:21:38.082664463 +0100
-@@ -29,7 +29,7 @@
- # http://www.freebsd.org/cgi/cvsweb.cgi/src/tools/regression/bin/test/regress.sh?rev=HEAD
- 
- expected-stdout:
--      @(#)MIRBSD KSH R42 2013/02/10
-+      @(#)MIRBSD KSH R42 2013/02/10 @DISTRO@
- description:
-       Check version of shell.
- stdin:

diff --git a/mksh.spec b/mksh.spec
index 697857260ba8b695f7080dba87a948479dc8fd7c..084cc22226f2abebf9b7eda30b62eef3777a09d2 100644 (file)
--- a/mksh.spec
+++ b/mksh.spec
@@ -4,18 +4,17 @@
 Summary:       MirBSD Korn Shell
 Summary(pl.UTF-8):     Powłoka Korna z MirBSD
 Name:          mksh
-Version:       42
+Version:       42b
 Release:       1
 License:       BSD
 Group:         Applications/Shells
 Source0:       http://www.mirbsd.org/MirOS/dist/mir/mksh/%{name}-R%{version}.tgz
-# Source0-md5: f1ad261f79f6ac45e8d5cc5bea191090
+# Source0-md5: 8b4b9182eb63b47390f164246959b661
 Source1:       %{name}-mkshrc
 Patch0:                %{name}-mkshrc_support.patch
 Patch1:                %{name}-circumflex.patch
 Patch2:                %{name}-no_stop_alias.patch
-Patch3:                %{name}-distro.patch
-Patch4:                %{name}-cmdline-length.patch
+Patch3:                %{name}-cmdline-length.patch
 URL:           https://www.mirbsd.org/mksh.htm
 %if %{with tests}
 BuildRequires: ed
@@ -85,9 +84,16 @@ mv mksh/* .; rmdir mksh
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
 
+# sed rules instead of patch (needed update for every release)
+sed -i -e 's|\(#define.*MKSH_VERSION.*\)"|\1 @DISTRO@"|g' sh.h
+sed -i -e 's|\(@(#)MIRBSD KSH.*\)|\1 @DISTRO@|g' check.t
+
+# fill distro
 sed -i -e 's#@DISTRO@#PLD/Linux 3.0#g' check.t sh.h
+# sanity checks
+grep PLD/Linux check.t || exit 1
+grep PLD/Linux sh.h || exit 1
 
 # we'll need this later due to -DMKSH_GCC55009
 cat >rtchecks <<'EOF'