diff --git a/.gitignore b/.gitignore index c45241d..a3d98f6 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,5 @@ INIT.2010-07-01.tgz /INIT.2011-01-04.tgz /ast-ksh.2011-01-18.tgz /INIT.2011-01-18.tgz +/ast-ksh.2011-01-27.tgz +/INIT.2011-01-27.tgz diff --git a/ksh-20110104-wctype.patch b/ksh-20110104-wctype.patch deleted file mode 100644 index 0d769b3..0000000 --- a/ksh-20110104-wctype.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff -up ksh-20110104/src/cmd/ksh93/sh/init.c.wcpatch ksh-20110104/src/cmd/ksh93/sh/init.c ---- ksh-20110104/src/cmd/ksh93/sh/init.c.wcpatch 2010-12-30 16:08:25.000000000 +0100 -+++ ksh-20110104/src/cmd/ksh93/sh/init.c 2011-01-17 14:45:06.199705445 +0100 -@@ -47,39 +47,8 @@ - #include "lexstates.h" - #include "version.h" - --#if _hdr_wctype - #include - #include --#endif --#if !_typ_wctrans_t --#undef wctrans_t --#define wctrans_t sh_wctrans_t --typedef int wctrans_t; --#endif --#if !_lib_wctrans --#undef wctrans --#define wctrans sh_wctrans --static wctrans_t wctrans(const char *name) --{ -- if(strcmp(name,e_tolower)==0) -- return(1); -- else if(strcmp(name,e_toupper)==0) -- return(2); -- return(0); --} --#endif --#if !_lib_towctrans --#undef towctrans --#define towctrans sh_towctrans --static int towctrans(int c, wctrans_t t) --{ -- if(t==1 && isupper(c)) -- c = tolower(c); -- else if(t==2 && isupper(c)) -- c = toupper(c); -- return(c); --} --#endif - - char e_version[] = "\n@(#)$Id: Version " - #if SHOPT_AUDIT diff --git a/ksh.spec b/ksh.spec index 02eab1d..3bef7a2 100644 --- a/ksh.spec +++ b/ksh.spec @@ -1,11 +1,11 @@ -%global releasedate 2011-01-18 +%global releasedate 2011-01-27 Name: ksh Summary: The Original ATT Korn Shell URL: http://www.kornshell.com/ Group: System Environment/Shells License: CPL -Version: 20110118 +Version: 20110127 Release: 1%{?dist} Source0: http://www.research.att.com/~gsf/download/tgz/ast-ksh.%{releasedate}.tgz Source1: http://www.research.att.com/~gsf/download/tgz/INIT.%{releasedate}.tgz @@ -20,9 +20,6 @@ Patch1: ksh-20070328-builtins.patch #fix regression test suite to be usable during packagebuild - Fedora/RHEL specific Patch2: ksh-20100826-fixregr.patch -#ksh's wctype.h detection script is broken, workaround it -Patch3: ksh-20110104-wctype.patch - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Conflicts: pdksh Requires: coreutils, glibc-common, diffutils @@ -43,7 +40,6 @@ with "sh" (the Bourne Shell). %setup -q -T -D -a 1 %patch1 -p1 -b .builtins %patch2 -p1 -b .fixregr -%patch3 -p1 -b .wcpatch #/dev/fd test does not work because of mock sed -i 's|ls /dev/fd|ls /proc/self/fd|' src/cmd/ksh93/features/options @@ -122,6 +118,9 @@ fi rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jan 28 2011 Michal Hlavinka - 20110127-1 +- ksh updated to 2011-01-27 + * Thu Jan 20 2011 Michal Hlavinka - 20110118-1 - ksh updated to 2011-01-18 diff --git a/sources b/sources index 045b6cf..1a59165 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -c11b64d2b579b72288c2dc4078c2e4d6 ast-ksh.2011-01-18.tgz -46bd49da3b45ad4a941b61f2c1f271d3 INIT.2011-01-18.tgz +07945dffc51987d1c5e9853154913b40 ast-ksh.2011-01-27.tgz +108c60eec278c446258a0b550451befc INIT.2011-01-27.tgz