[ksh] ksh updated to 2012-01-01
Michal Hlavinka
mhlavink at fedoraproject.org
Thu Jan 5 09:27:04 UTC 2012
commit e31ae3cf5096b365016a701e5271313d064c84cd
Author: Michal Hlavinka <mhlavink at redhat.com>
Date: Thu Jan 5 10:26:59 2012 +0100
ksh updated to 2012-01-01
.gitignore | 2 ++
ksh-20110505-resume.patch | 11 -----------
ksh-20110630-ddotfix.patch | 12 ------------
ksh-20110630-dontstop.patch | 21 ---------------------
ksh-20110630-fixkill.patch | 20 --------------------
ksh-20110630-histfix.patch | 21 ---------------------
ksh-20110630-ifsfix.patch | 23 -----------------------
ksh-20110630-joblimit.patch | 19 -------------------
ksh-20110630-tmoutfix.patch | 12 ------------
ksh.spec | 36 ++++++++----------------------------
sources | 4 ++--
11 files changed, 12 insertions(+), 169 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 78b75b9..8e84601 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,3 +36,5 @@ INIT.2010-07-01.tgz
/INIT.2011-05-05.tgz
/ast-ksh.2011-06-30.tgz
/INIT.2011-06-30.tgz
+/ast-ksh.2012-01-01.tgz
+/INIT.2012-01-01.tgz
diff --git a/ksh.spec b/ksh.spec
index 1837580..d7242e1 100644
--- a/ksh.spec
+++ b/ksh.spec
@@ -1,12 +1,12 @@
-%global releasedate 2011-06-30
+%global releasedate 2012-01-01
Name: ksh
Summary: The Original ATT Korn Shell
URL: http://www.kornshell.com/
Group: System Environment/Shells
-License: CPL
-Version: 20110630
-Release: 9%{?dist}
+License: EPL
+Version: 20120101
+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
Source3: kshrc.rhs
@@ -20,22 +20,6 @@ Patch1: ksh-20070328-builtins.patch
#fix regression test suite to be usable during packagebuild - Fedora/RHEL specific
Patch2: ksh-20100826-fixregr.patch
-# for ksh < 2011-08-03
-Patch3: ksh-20110630-ifsfix.patch
-
-# sent upstream, for ksh <= 2011-08-12
-Patch4: ksh-20110630-fixkill.patch
-
-Patch5: ksh-20110630-tmoutfix.patch
-
-Patch6: ksh-20110630-joblimit.patch
-
-Patch7: ksh-20110630-dontstop.patch
-
-Patch8: ksh-20110630-ddotfix.patch
-
-Patch9: ksh-20110630-histfix.patch
-
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Conflicts: pdksh
Requires: coreutils, glibc-common, diffutils
@@ -56,13 +40,6 @@ with "sh" (the Bourne Shell).
%setup -q -T -D -a 1
%patch1 -p1 -b .builtins
%patch2 -p1 -b .fixregr
-%patch3 -p1 -b .ifsfix
-%patch4 -p1 -b .fixkill
-%patch5 -p1 -b .tmoutfix
-%patch6 -p1 -b .joblimit
-%patch7 -p1 -b .dontstop
-%patch8 -p1 -b .ddotfix
-%patch9 -p1 -b .histfix
#/dev/fd test does not work because of mock
sed -i 's|ls /dev/fd|ls /proc/self/fd|' src/cmd/ksh93/features/options
@@ -75,7 +52,7 @@ export CCFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
export CC=gcc
./bin/package "make"
-cp lib/package/LICENSES/cpl LICENSE
+cp lib/package/LICENSES/epl LICENSE
%install
rm -rf $RPM_BUILD_ROOT
@@ -148,6 +125,9 @@ fi
rm -rf $RPM_BUILD_ROOT
%changelog
+* Thu Jan 05 2012 Michal Hlavinka <mhlavink at redhat.com> - 20120101-1
+- ksh updated to 2012-01-01
+
* Wed Dec 07 2011 Michal Hlavinka <mhlavink at redhat.com> - 20110630-9
- do not crash when browsing through history containing comment (#733813)
diff --git a/sources b/sources
index a034c80..8b22f77 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-5f07713ecdb7dc2caa1def00672b308a ast-ksh.2011-06-30.tgz
-de7e347b8e33130daad338a1e29112ff INIT.2011-06-30.tgz
+546db2efb36ace2fd63dcfaeb6d0bfce ast-ksh.2012-01-01.tgz
+95ad11566df5c0aeca9e01f3171dd3f4 INIT.2012-01-01.tgz
More information about the scm-commits
mailing list