packages: mksh/mksh.spec, mksh/mksh-distro.patch (NEW) - mark version as PL...

arekm arekm at pld-linux.org
Tue Jul 12 08:04:49 CEST 2011


Author: arekm                        Date: Tue Jul 12 06:04:49 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- mark version as PLD; requested by upstream

---- Files affected:
packages/mksh:
   mksh.spec (1.28 -> 1.29) , mksh-distro.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/mksh/mksh.spec
diff -u packages/mksh/mksh.spec:1.28 packages/mksh/mksh.spec:1.29
--- packages/mksh/mksh.spec:1.28	Fri Jul  8 11:17:31 2011
+++ packages/mksh/mksh.spec	Tue Jul 12 08:04:43 2011
@@ -17,6 +17,7 @@
 Patch2:		%{name}-no_stop_alias.patch
 Patch3:		%{name}-tty.patch
 Patch4:		%{name}-test.patch
+Patch5:		%{name}-distro.patch
 URL:		https://www.mirbsd.org/mksh.htm
 %if %{with tests}
 BuildRequires:	ed
@@ -87,6 +88,9 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+
+sed -i -e 's#@DISTRO@# PLD/Linux 3.0#g' check.t sh.h
 
 %build
 install -d out
@@ -163,6 +167,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.29  2011/07/12 06:04:43  arekm
+- mark version as PLD; requested by upstream
+
 Revision 1.28  2011/07/08 09:17:31  arekm
 - release 5
 

================================================================
Index: packages/mksh/mksh-distro.patch
diff -u /dev/null packages/mksh/mksh-distro.patch:1.1
--- /dev/null	Tue Jul 12 08:04:49 2011
+++ packages/mksh/mksh-distro.patch	Tue Jul 12 08:04:43 2011
@@ -0,0 +1,24 @@
+diff -ur mksh.org/check.t mksh/check.t
+--- mksh.org/check.t	2011-06-12 16:59:07.000000000 +0200
++++ mksh/check.t	2011-07-12 08:00:42.528102214 +0200
+@@ -25,7 +25,7 @@
+ # http://www.research.att.com/~gsf/public/ifs.sh
+ 
+ expected-stdout:
+-	@(#)MIRBSD KSH R40 2011/06/12
++	@(#)MIRBSD KSH R40 2011/06/12 @DISTRO@
+ description:
+ 	Check version of shell.
+ stdin:
+diff -ur mksh.org/sh.h mksh/sh.h
+--- mksh.org/sh.h	2011-06-12 16:59:09.000000000 +0200
++++ mksh/sh.h	2011-07-12 08:01:04.445312267 +0200
+@@ -153,7 +153,7 @@
+ #ifdef EXTERN
+ __RCSID("$MirOS: src/bin/mksh/sh.h,v 1.476 2011/06/12 14:58:45 tg Exp $");
+ #endif
+-#define MKSH_VERSION "R40 2011/06/12"
++#define MKSH_VERSION "R40 2011/06/12 @DISTRO@"
+ 
+ #ifndef MKSH_INCLUDES_ONLY
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mksh/mksh.spec?r1=1.28&r2=1.29&f=u



More information about the pld-cvs-commit mailing list