Accepting request 94661 from shells
I fixed the changelog to say 4._3_.13 not 4.2, sorry! - Update to zsh 4.3.13 * There are no significant feature changes to the shell itself, although many bug fixes and improvements to functions. * See included ChangeLog for details - Drop zsh-4.3.12-ksh-emulation-syntax-checking.patch, fixed upstream - Cleanup spec file - Make /bin/zsh a symlink to /usr/bin/zsh - Update to 4.3.12-test3 * See included ChangeLog for details - Drop zsh-findproc.patch and zsh-kill-suspended-job.patch, fixed upstream. OBS-URL: https://build.opensuse.org/request/show/94661 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/zsh?expand=0&rev=35
This commit is contained in:
commit
4c9eb56b56
@ -1,15 +0,0 @@
|
||||
diff -ruN zsh-4.3.12-orig/Src/subst.c zsh-4.3.12/Src/subst.c
|
||||
--- zsh-4.3.12-orig/Src/subst.c 2011-05-23 18:48:19.000000000 +0200
|
||||
+++ zsh-4.3.12/Src/subst.c 2011-06-29 13:44:13.000000000 +0200
|
||||
@@ -245,7 +245,10 @@
|
||||
if (endchar == Outpar && str2[1] == '(' && str[-2] == ')') {
|
||||
/* Math substitution of the form $((...)) */
|
||||
str[-2] = '\0';
|
||||
- str = arithsubst(str2 + 2, &str3, str);
|
||||
+ if (isset(EXECOPT))
|
||||
+ str = arithsubst(str2 + 2, &str3, str);
|
||||
+ else
|
||||
+ strncpy(str3, str2, 1);
|
||||
setdata(node, (void *) str3);
|
||||
continue;
|
||||
}
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:4a9fd2dac76fc08fd1dc400deba854fcefa12ad76226d93fb6c01a801324f106
|
||||
size 2917959
|
3
zsh-4.3.13.tar.bz2
Normal file
3
zsh-4.3.13.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:173bafa9f363050de40c50492eccbd8c55d85401a42b076b2178c2d9d5355d9c
|
||||
size 2964918
|
@ -1,20 +0,0 @@
|
||||
commit 21c39600ef2d74c3e7474c4e5b89805656c6fe4e
|
||||
Author: Bart Schaefer <barts@users.sourceforge.net>
|
||||
Date: Sun Jun 12 15:06:37 2011 +0000
|
||||
|
||||
29472: findproc() needs at least to also return stopped jobs.
|
||||
|
||||
diff --git a/Src/jobs.c b/Src/jobs.c
|
||||
index b3ec000..0ace80b 100644
|
||||
--- a/Src/jobs.c
|
||||
+++ b/Src/jobs.c
|
||||
@@ -189,7 +189,8 @@ findproc(pid_t pid, Job *jptr, Process *pptr, int aux)
|
||||
* the termination of the process which pid we were supposed
|
||||
* to return in a different job.
|
||||
*/
|
||||
- if (pn->pid == pid && pn->status == SP_RUNNING) {
|
||||
+ if (pn->pid == pid && (pn->status == SP_RUNNING ||
|
||||
+ WIFSTOPPED(pn->status))) {
|
||||
*pptr = pn;
|
||||
*jptr = jobtab + i;
|
||||
return 1;
|
@ -1,53 +0,0 @@
|
||||
commit 98b29d02ca17068779f4b8fa2d43c9753386478f
|
||||
Author: Bart Schaefer <barts@users.sourceforge.net>
|
||||
Date: Wed Jun 15 15:38:14 2011 +0000
|
||||
|
||||
29481: always return a matching job in findproc() but scan the whole list
|
||||
to prefer running jobs
|
||||
|
||||
diff --git a/Src/jobs.c b/Src/jobs.c
|
||||
index 0ace80b..9c9b12f 100644
|
||||
--- a/Src/jobs.c
|
||||
+++ b/Src/jobs.c
|
||||
@@ -160,6 +160,8 @@ findproc(pid_t pid, Job *jptr, Process *pptr, int aux)
|
||||
Process pn;
|
||||
int i;
|
||||
|
||||
+ *jptr = NULL;
|
||||
+ *pptr = NULL;
|
||||
for (i = 1; i <= maxjob; i++)
|
||||
{
|
||||
/*
|
||||
@@ -189,16 +191,16 @@ findproc(pid_t pid, Job *jptr, Process *pptr, int aux)
|
||||
* the termination of the process which pid we were supposed
|
||||
* to return in a different job.
|
||||
*/
|
||||
- if (pn->pid == pid && (pn->status == SP_RUNNING ||
|
||||
- WIFSTOPPED(pn->status))) {
|
||||
+ if (pn->pid == pid) {
|
||||
*pptr = pn;
|
||||
*jptr = jobtab + i;
|
||||
- return 1;
|
||||
+ if (pn->status == SP_RUNNING)
|
||||
+ return 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
- return 0;
|
||||
+ return (*pptr && *jptr);
|
||||
}
|
||||
|
||||
/* Does the given job number have any processes? */
|
||||
diff --git a/Src/signals.c b/Src/signals.c
|
||||
index 456a853..a848acd 100644
|
||||
--- a/Src/signals.c
|
||||
+++ b/Src/signals.c
|
||||
@@ -489,7 +489,6 @@ wait_for_processes(void)
|
||||
* Find the process and job containing this pid and
|
||||
* update it.
|
||||
*/
|
||||
- pn = NULL;
|
||||
if (findproc(pid, &jn, &pn, 0)) {
|
||||
#if defined(HAVE_WAIT3) && defined(HAVE_GETRUSAGE)
|
||||
struct timezone dummy_tz;
|
24
zsh.changes
24
zsh.changes
@ -1,3 +1,27 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Nov 30 21:49:26 UTC 2011 - idoenmez@suse.de
|
||||
|
||||
- Update to zsh 4.3.13
|
||||
* There are no significant feature changes to the shell itself,
|
||||
although many bug fixes and improvements to functions.
|
||||
* See included ChangeLog for details
|
||||
- Drop zsh-4.3.12-ksh-emulation-syntax-checking.patch,
|
||||
fixed upstream
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Nov 29 14:19:04 UTC 2011 - idoenmez@suse.de
|
||||
|
||||
- Cleanup spec file
|
||||
- Make /bin/zsh a symlink to /usr/bin/zsh
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Nov 28 08:36:51 UTC 2011 - idoenmez@suse.de
|
||||
|
||||
- Update to 4.3.12-test3
|
||||
* See included ChangeLog for details
|
||||
- Drop zsh-findproc.patch and zsh-kill-suspended-job.patch, fixed
|
||||
upstream.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 24 09:00:37 UTC 2011 - idoenmez@suse.de
|
||||
|
||||
|
43
zsh.spec
43
zsh.spec
@ -18,7 +18,7 @@
|
||||
|
||||
|
||||
Name: zsh
|
||||
Version: 4.3.12
|
||||
Version: 4.3.13
|
||||
Release: 4
|
||||
License: BSD
|
||||
Summary: Shell with comprehensive completion
|
||||
@ -28,8 +28,7 @@ Group: System/Shells
|
||||
%else
|
||||
Group: System Environment/Shells
|
||||
%endif
|
||||
#Source0: ftp://ftp.fu-berlin.de/pub/unix/shells/zsh/zsh-4.3.12.tar.bz2
|
||||
Source0: %{name}-%{version}.tar.bz2
|
||||
Source0: ftp://ftp.zsh.org/pub/zsh-%{version}.tar.bz2
|
||||
Source1: zshrc
|
||||
Source2: zshenv
|
||||
Source3: zprofile
|
||||
@ -42,22 +41,18 @@ Source15: zshenv.rhs
|
||||
Source16: dotzshrc.rh
|
||||
Source17: zshprompt.pl
|
||||
%endif
|
||||
Patch1: %{name}-%{version}-disable-c02cond-test.patch
|
||||
# PATCH-FIX-UPSTREAM zsh-findproc.patch idoenmez@suse.de -- Upstream commit 21c39600ef2d74c3e7474c4e5b89805656c6fe4e
|
||||
Patch2: %{name}-findproc.patch
|
||||
# PATCH-FIX-UPSTREAM zsh-kill-suspended-job.patch idoenmez@suse.de -- Upstream commit 98b29d02ca17068779f4b8fa2d43c9753386478f
|
||||
Patch3: %{name}-kill-suspended-job.patch
|
||||
# PATCH-FIX ksh-emulation-syntax-checking.patch -- Import and rework from RHEL (zsh-4.2.6)
|
||||
Patch4: %{name}-4.3.12-ksh-emulation-syntax-checking.patch
|
||||
Patch1: %{name}-4.3.12-disable-c02cond-test.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
%if 0%{?suse_version}
|
||||
PreReq: %{install_info_prereq}
|
||||
Requires(pre): %{install_info_prereq}
|
||||
%if 0%{?suse_version} >= 1110
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: yodl
|
||||
%endif
|
||||
%else
|
||||
PreReq: fileutils grep /sbin/install-info
|
||||
Requires(pre): /sbin/install-info
|
||||
Requires(pre): fileutils
|
||||
Requires(pre): grep
|
||||
%endif
|
||||
|
||||
BuildRequires: libcap-devel
|
||||
@ -65,9 +60,9 @@ BuildRequires: ncurses-devel
|
||||
BuildRequires: pcre-devel
|
||||
%if 0%{?rhel_version} || 0%{?centos_version} || 0%{?fedora_version}
|
||||
BuildRequires: libtermcap-devel
|
||||
BuildRequires: tetex
|
||||
BuildRequires: texi2html
|
||||
BuildRequires: texinfo
|
||||
BuildRequires: tetex
|
||||
%endif
|
||||
|
||||
%description
|
||||
@ -99,14 +94,10 @@ mechanism, and more.
|
||||
This package contains the Zsh manual in html format.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%setup -q -n %{name}-%{version}
|
||||
%patch1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
|
||||
##rpmlint
|
||||
# spurious-executable-perm
|
||||
# Remove executable bit
|
||||
chmod 0644 Etc/changelog2html.pl
|
||||
|
||||
%if 0%{?rhel_version} || 0%{?centos_version} || 0%{?fedora_version}
|
||||
@ -120,7 +111,6 @@ perl -p -i -e 's|/usr/local/bin|%{_bindir}|' \
|
||||
Util/reporter
|
||||
|
||||
%build
|
||||
# readd the site-* dir.
|
||||
%configure \
|
||||
--enable-site-scriptdir=%{_datadir}/%{name}/site/scripts/ \
|
||||
--enable-site-fndir=%{_datadir}/%{name}/site/scripts/ \
|
||||
@ -160,7 +150,7 @@ rm -f Etc/Makefile* Etc/*.yo
|
||||
|
||||
%install
|
||||
%if 0%{?rhel_version} || 0%{?centos_version} || 0%{?fedora_version}
|
||||
rm -rf %{buildroot}
|
||||
rm -rf %{buildroot}
|
||||
%endif
|
||||
|
||||
%if 0%{?suse_version}
|
||||
@ -176,7 +166,7 @@ install -m 0755 -Dd %{buildroot}/{etc,bin}
|
||||
install -m 0644 %{SOURCE1} %{SOURCE2} %{SOURCE3} %{buildroot}%{_sysconfdir}
|
||||
|
||||
# Create custom completion directory
|
||||
mkdir %{buildroot}/etc/zsh_completion.d
|
||||
mkdir %{buildroot}%{_sysconfdir}/zsh_completion.d
|
||||
%endif
|
||||
|
||||
%if 0%{?rhel_version} || 0%{?centos_version} || 0%{?fedora_version}
|
||||
@ -192,8 +182,7 @@ install -m 0755 -Dd %{buildroot}%{_datadir}/%{name}/%{version}/help
|
||||
install -m 0644 Help/* %{buildroot}%{_datadir}/%{name}/%{version}/help/
|
||||
|
||||
# link zsh binary
|
||||
mv %{buildroot}%{_bindir}/zsh %{buildroot}/bin/zsh
|
||||
ln -s -f ../../bin/zsh %{buildroot}%{_bindir}/zsh
|
||||
ln -sf %{_bindir}/zsh %{buildroot}/bin/zsh
|
||||
|
||||
# Remove versioned zsh binary
|
||||
rm -f %{buildroot}%{_bindir}/zsh-*
|
||||
@ -257,9 +246,6 @@ fi
|
||||
fi
|
||||
%endif
|
||||
|
||||
%clean
|
||||
rm -rf %{buildroot}
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%doc ChangeLog FEATURES LICENCE MACHINES META-FAQ NEWS README
|
||||
@ -275,14 +261,13 @@ rm -rf %{buildroot}
|
||||
%endif
|
||||
|
||||
%if 0%{?suse_version}
|
||||
%dir /etc/zsh_completion.d
|
||||
%dir %{_sysconfdir}/zsh_completion.d
|
||||
%endif
|
||||
|
||||
%{_bindir}/zsh
|
||||
/bin/zsh
|
||||
%{_libdir}/zsh/
|
||||
%{_datadir}/zsh/
|
||||
#exclude %{_datadir}/zsh/htmldoc
|
||||
%{_infodir}/zsh.info*.gz
|
||||
%{_mandir}/man1/zsh*.1.gz
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user