[mksh] Added upstream patch to avoid build failure

Robert Scheck robert at fedoraproject.org
Sun May 5 13:47:04 UTC 2013


commit c39c2d52ff030e18c9c05d3be4b1c568d02199e4
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sun May 5 15:46:45 2013 +0200

    Added upstream patch to avoid build failure

 mksh-46-lksh.patch |   49 +++++++++++++++++++++++++++++++++++++++++++++++++
 mksh.spec          |    2 ++
 2 files changed, 51 insertions(+), 0 deletions(-)
---
diff --git a/mksh-46-lksh.patch b/mksh-46-lksh.patch
new file mode 100644
index 0000000..e146a69
--- /dev/null
+++ b/mksh-46-lksh.patch
@@ -0,0 +1,49 @@
+Index: Build.sh
+===================================================================
+RCS file: /cvs/src/bin/mksh/Build.sh,v
+retrieving revision 1.630
+retrieving revision 1.631
+diff -u -p -r1.630 -r1.631
+--- Build.sh	2 May 2013 21:59:44 -0000	1.630
++++ Build.sh	5 May 2013 13:38:00 -0000	1.631
+@@ -63,7 +63,7 @@ vq() {
+ rmf() {
+ 	for _f in "$@"; do
+ 		case $_f in
+-		Build.sh|check.pl|check.t|dot.mkshrc|*.c|*.h|mksh.1) ;;
++		Build.sh|check.pl|check.t|dot.mkshrc|*.c|*.h|lksh.1|mksh.1) ;;
+ 		*) rm -f "$_f" ;;
+ 		esac
+ 	done
+@@ -458,7 +458,7 @@ oswarn=
+ ccpc=-Wc,
+ ccpl=-Wl,
+ tsts=
+-ccpr='|| for _f in ${tcfn}*; do case $_f in Build.sh|check.pl|check.t|dot.mkshrc|*.c|*.h|mksh.1) ;; *) rm -f "$_f" ;; esac; done'
++ccpr='|| for _f in ${tcfn}*; do case $_f in Build.sh|check.pl|check.t|dot.mkshrc|*.c|*.h|lksh.1|mksh.1) ;; *) rm -f "$_f" ;; esac; done'
+ 
+ # Evil hack
+ if test x"$TARGET_OS" = x"Android"; then
+@@ -2268,8 +2268,10 @@ test 1 = $eq && e=:
+ $e
+ $e Installing the shell:
+ $e "# $i -c -s -o root -g bin -m 555 $tfn /bin/$tfn"
+-$e "# grep -x /bin/$tfn /etc/shells >/dev/null || echo /bin/$tfn >>/etc/shells"
+-$e "# $i -c -o root -g bin -m 444 dot.mkshrc /usr/share/doc/mksh/examples/"
++if test $legacy = 0; then
++	$e "# grep -x /bin/$tfn /etc/shells >/dev/null || echo /bin/$tfn >>/etc/shells"
++	$e "# $i -c -o root -g bin -m 444 dot.mkshrc /usr/share/doc/mksh/examples/"
++fi
+ $e
+ $e Installing the manual:
+ if test -f $tfn.cat1; then
+@@ -2277,7 +2279,7 @@ if test -f $tfn.cat1; then
+ 	    "/usr/share/man/cat1/$tfn.0"
+ 	$e or
+ fi
+-$e "# $i -c -o root -g bin -m 444 mksh.1 /usr/share/man/man1/$tfn.1"
++$e "# $i -c -o root -g bin -m 444 $tfn.1 /usr/share/man/man1/$tfn.1"
+ $e
+ $e Run the regression test suite: ./test.sh
+ $e Please also read the sample file dot.mkshrc and the fine manual.
+
diff --git a/mksh.spec b/mksh.spec
index 0c27c58..fd91cc0 100644
--- a/mksh.spec
+++ b/mksh.spec
@@ -10,6 +10,7 @@ URL:              https://www.mirbsd.de/%{name}.htm
 Source0:          http://www.mirbsd.org/MirOS/dist/mir/%{name}/%{name}-R%{version}.tgz
 Source1:          dot-mkshrc
 Source2:          rtchecks.expected
+Patch0:           mksh-46-lksh.patch
 Requires(post):   grep
 Requires(postun): sed
 BuildRequires:    util-linux, ed
@@ -24,6 +25,7 @@ bourne shell replacement, pdksh successor and an alternative to the C shell.
 
 %prep
 %setup -q -n %{name}
+%patch0 -p0 -b .lksh
 
 # we'll need this later
 cat >rtchecks <<'EOF'


More information about the scm-commits mailing list