diff --git a/ksh-1.0.10.tar.gz b/ksh-1.0.10.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..6603920c84cc8b5b56775f9a5d31a3ab41b325c7 Binary files /dev/null and b/ksh-1.0.10.tar.gz differ diff --git a/ksh-1.0.4.tar.gz b/ksh-1.0.4.tar.gz deleted file mode 100644 index e4f517203fb841cf815c21173f7c863eb8eb12ad..0000000000000000000000000000000000000000 Binary files a/ksh-1.0.4.tar.gz and /dev/null differ diff --git a/ksh.spec b/ksh.spec index dcd8356a038d435ec41711881309bd6d8a353bea..5be55fe049657b8a067e1d29bed9a1bff3ec83fd 100644 --- a/ksh.spec +++ b/ksh.spec @@ -5,7 +5,7 @@ Summary: The Original ATT Korn Shell URL: http://www.kornshell.com/ License: EPL-2.0 Epoch: 3 -Version: 1.0.4 +Version: 1.0.10 Release: %{anolis_release}%{?dist} Source0: https://github.com/ksh93/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz Source1: kshcomp.conf @@ -16,8 +16,13 @@ Conflicts: pdksh Requires: coreutils, diffutils BuildRequires: gcc BuildRequires: bison -# regression test suite uses 'ps' from procps +# regression test suite requirements +BuildRequires: glibc-langpack-ja +BuildRequires: ncurses BuildRequires: procps +BuildRequires: tzdata +BuildRequires: util-linux + Requires(post): grep, coreutils, systemd Requires(postun): sed @@ -44,12 +49,9 @@ The %{name}-doc package contains documentation files for %{name}. # /dev/fd test does not work because of mock sed -i 's|ls /dev/fd|ls /proc/self/fd|' src/cmd/ksh93/features/options -# disable register for debugging -sed -i 1i"#define register" src/lib/libast/include/ast.h - %build XTRAFLAGS="" -for f in -Wno-unknown-pragmas -Wno-missing-braces -Wno-unused-result -Wno-return-type -Wno-int-to-pointer-cast -Wno-parentheses -Wno-unused -Wno-unused-but-set-variable -Wno-cpp -Wno-maybe-uninitialized -Wno-lto-type-mismatch -P +for f in -Wno-unknown-pragmas -Wno-missing-braces -Wno-unused-result -Wno-return-type -Wno-int-to-pointer-cast -Wno-parentheses -Wno-unused -Wno-unused-but-set-variable -Wno-cpp -Wno-maybe-uninitialized -Wno-lto-type-mismatch do $CC $f -E - /dev/null 2>&1 && XTRAFLAGS="$XTRAFLAGS $f" done @@ -67,15 +69,16 @@ install -p -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/kshrc install -p -D -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/binfmt.d/kshcomp.conf touch %{buildroot}%{_bindir}/ksh -touch %{buildroot}%{_mandir}/man1/ksh.1.zst +touch %{buildroot}%{_mandir}/man1/ksh.1.gz touch %{buildroot}%{_bindir}/rksh -touch %{buildroot}%{_mandir}/man1/rksh.1.zst +touch %{buildroot}%{_mandir}/man1/rksh.1.gz %generate_compatibility_deps %check -bin/package test +# script is needed for pty tests in mock +script -q -e -c "bin/package test" %post for s in /bin/ksh /bin/rksh /usr/bin/ksh /usr/bin/rksh @@ -93,17 +96,17 @@ done %{_bindir}/ksh93 50 \ --slave %{_bindir}/rksh rksh \ %{_bindir}/ksh93 \ - --slave %{_mandir}/man1/rksh.1.zst rksh-man \ - %{_mandir}/man1/ksh93.1.zst \ - --slave %{_mandir}/man1/ksh.1.zst ksh-man \ - %{_mandir}/man1/ksh93.1.zst + --slave %{_mandir}/man1/rksh.1.gz rksh-man \ + %{_mandir}/man1/ksh93.1.gz \ + --slave %{_mandir}/man1/ksh.1.gz ksh-man \ + %{_mandir}/man1/ksh93.1.gz #if not symlink we are updating ksh where there was no alternatives before #so replace with symlink and set alternatives if [ ! -L %{_bindir}/ksh ]; then %{_sbindir}/alternatives --auto ksh ln -sf /etc/alternatives/ksh %{_bindir}/ksh - ln -sf /etc/alternatives/ksh-man %{_mandir}/man1/ksh.1.zst + ln -sf /etc/alternatives/ksh-man %{_mandir}/man1/ksh.1.gz fi /bin/systemctl try-restart systemd-binfmt.service >/dev/null 2>&1 || : @@ -137,8 +140,8 @@ fi %ghost %{_bindir}/rksh %{_bindir}/shcomp %{_mandir}/man1/ksh93.1* -%ghost %{_mandir}/man1/ksh.1.zst -%ghost %{_mandir}/man1/rksh.1.zst +%ghost %{_mandir}/man1/ksh.1* +%ghost %{_mandir}/man1/rksh.1* %config(noreplace) %{_sysconfdir}/skel/.kshrc %config(noreplace) %{_sysconfdir}/kshrc %config(noreplace) %{_sysconfdir}/binfmt.d/kshcomp.conf @@ -150,5 +153,8 @@ fi %doc README.md NEWS %changelog +* Fri Feb 21 2025 Xiaoping Liu - 3:1.0.10-1 +- Refer to CentOS Stream ksh-3:1.0.10-2 (tdawson@redhat.com) + * Sat Mar 25 2023 happy_orange - 3:1.0.4-1 - init package from upstream