[ksh/f15] ksh updated to 2011-06-30
Michal Hlavinka
mhlavink at fedoraproject.org
Fri Aug 12 07:52:13 UTC 2011
commit 308459a47a19c08e6535f92b716da93f1bf1368d
Author: Michal Hlavinka <mhlavink at redhat.com>
Date: Fri Aug 12 09:51:59 2011 +0200
ksh updated to 2011-06-30
.gitignore | 40 ++++++++++++++++++++++++++++++++++++++--
ksh.spec | 22 ++++++++++++----------
sources | 4 ++--
3 files changed, 52 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 730f2c0..78b75b9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,38 @@
-ast-ksh.2011-05-05.tgz
-INIT.2011-05-05.tgz
+ast-ksh.2010-07-01.tgz
+INIT.2010-07-01.tgz
+/ast-ksh.2010-08-11.tgz
+/INIT.2010-08-11.tgz
+/ast-ksh.2010-08-26.tgz
+/INIT.2010-08-26.tgz
+/ast-ksh.2010-09-24.tgz
+/INIT.2010-09-24.tgz
+/ast-ksh.2010-10-10.tgz
+/INIT.2010-10-10.tgz
+/ast-ksh.2010-10-26.tgz
+/INIT.2010-10-26.tgz
+/ast-ksh.2010-11-22.tgz
+/INIT.2010-11-22.tgz
+/ast-ksh.2010-12-01.tgz
+/INIT.2010-12-01.tgz
+/ast-ksh.2010-12-12.tgz
+/INIT.2010-12-12.tgz
+/ast-ksh.2011-01-04.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
+/ast-ksh.2011-01-31.tgz
+/INIT.2011-01-31.tgz
+/ast-ksh.2011-02-02.tgz
+/INIT.2011-02-02.tgz
+/ast-ksh.2011-02-08.tgz
+/INIT.2011-02-08.tgz
+/ast-ksh.2011-04-15.tgz
+/INIT.2011-04-15.tgz
+/ast-ksh.2011-04-28.tgz
+/INIT.2011-04-28.tgz
+/ast-ksh.2011-05-05.tgz
+/INIT.2011-05-05.tgz
+/ast-ksh.2011-06-30.tgz
+/INIT.2011-06-30.tgz
diff --git a/ksh.spec b/ksh.spec
index 5b97e9e..d08eb8f 100644
--- a/ksh.spec
+++ b/ksh.spec
@@ -1,12 +1,12 @@
-%global releasedate 2011-05-05
+%global releasedate 2011-06-30
Name: ksh
Summary: The Original ATT Korn Shell
URL: http://www.kornshell.com/
Group: System Environment/Shells
License: CPL
-Version: 20110505
-Release: 3%{?dist}
+Version: 20110630
+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,10 +20,8 @@ Patch1: ksh-20070328-builtins.patch
#fix regression test suite to be usable during packagebuild - Fedora/RHEL specific
Patch2: ksh-20100826-fixregr.patch
-Patch3: ksh-20110505-resume.patch
-
# for ksh < 2011-08-03
-Patch4: ksh-20110630-ifsfix.patch
+Patch3: ksh-20110630-ifsfix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Conflicts: pdksh
@@ -45,8 +43,7 @@ with "sh" (the Bourne Shell).
%setup -q -T -D -a 1
%patch1 -p1 -b .builtins
%patch2 -p1 -b .fixregr
-%patch3 -p1 -b .resume
-%patch4 -p1 -b .fixifs
+%patch3 -p1 -b .ifsfix
#/dev/fd test does not work because of mock
sed -i 's|ls /dev/fd|ls /proc/self/fd|' src/cmd/ksh93/features/options
@@ -59,7 +56,8 @@ export CCFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
export CC=gcc
./bin/package "make"
-cp lib/package/LICENSES/ast LICENSE
+#missing in latest tarball
+#cp lib/package/LICENSES/ast LICENSE
%install
rm -rf $RPM_BUILD_ROOT
@@ -114,7 +112,8 @@ fi
%files
%defattr(-, root, root,-)
-%doc README LICENSE
+# LICENSE missing in latest tarball
+%doc README
/bin/ksh
/usr/bin/shcomp
%{_mandir}/man1/*
@@ -125,6 +124,9 @@ fi
rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Aug 12 2011 Michal Hlavinka <mhlavink at redhat.com> - 20110630-1
+- ksh updated to 2011-06-30
+
* Wed Aug 03 2011 Michal Hlavinka <mhlavink at redhat.com> - 20110505-3
- fix: IFS manipulation in a function can cause crash
diff --git a/sources b/sources
index b74ae7f..a034c80 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-66017586210d33bc45641bb4f63c9325 ast-ksh.2011-05-05.tgz
-438bbad8d15f408f9e1eeba8cb530d50 INIT.2011-05-05.tgz
+5f07713ecdb7dc2caa1def00672b308a ast-ksh.2011-06-30.tgz
+de7e347b8e33130daad338a1e29112ff INIT.2011-06-30.tgz
More information about the scm-commits
mailing list