From 0eed1e9c2ceea186ad975a90a155a026e87bce02f7a7bb22d246660642898ff6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Mon, 28 Nov 2011 08:43:12 +0000 Subject: [PATCH 1/5] - Update to 4.2.12-test3 * See included ChangeLog OBS-URL: https://build.opensuse.org/package/show/shells/zsh?expand=0&rev=80 --- zsh-4.3.12-test-3.tar.bz2 | 3 ++ zsh-4.3.12.tar.bz2 | 3 -- zsh-findproc.patch | 20 -------------- zsh-kill-suspended-job.patch | 53 ------------------------------------ zsh.changes | 8 ++++++ zsh.spec | 20 ++++---------- 6 files changed, 16 insertions(+), 91 deletions(-) create mode 100644 zsh-4.3.12-test-3.tar.bz2 delete mode 100644 zsh-4.3.12.tar.bz2 delete mode 100644 zsh-findproc.patch delete mode 100644 zsh-kill-suspended-job.patch diff --git a/zsh-4.3.12-test-3.tar.bz2 b/zsh-4.3.12-test-3.tar.bz2 new file mode 100644 index 0000000..d22e2ad --- /dev/null +++ b/zsh-4.3.12-test-3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:47bd04cb35933d2a9d70fb8301f7dc08e55da4a80f4f79c7d70a9423d617aa11 +size 2965438 diff --git a/zsh-4.3.12.tar.bz2 b/zsh-4.3.12.tar.bz2 deleted file mode 100644 index 758b1d7..0000000 --- a/zsh-4.3.12.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4a9fd2dac76fc08fd1dc400deba854fcefa12ad76226d93fb6c01a801324f106 -size 2917959 diff --git a/zsh-findproc.patch b/zsh-findproc.patch deleted file mode 100644 index 73c4533..0000000 --- a/zsh-findproc.patch +++ /dev/null @@ -1,20 +0,0 @@ -commit 21c39600ef2d74c3e7474c4e5b89805656c6fe4e -Author: Bart Schaefer -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; diff --git a/zsh-kill-suspended-job.patch b/zsh-kill-suspended-job.patch deleted file mode 100644 index 12d719b..0000000 --- a/zsh-kill-suspended-job.patch +++ /dev/null @@ -1,53 +0,0 @@ -commit 98b29d02ca17068779f4b8fa2d43c9753386478f -Author: Bart Schaefer -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; diff --git a/zsh.changes b/zsh.changes index 5fc0c73..1a2a245 100644 --- a/zsh.changes +++ b/zsh.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Nov 28 08:36:51 UTC 2011 - idoenmez@suse.de + +- Update to 4.2.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 diff --git a/zsh.spec b/zsh.spec index e7079ab..d1259ce 100644 --- a/zsh.spec +++ b/zsh.spec @@ -18,7 +18,7 @@ Name: zsh -Version: 4.3.12 +Version: 4.3.12+test3 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/development/zsh-4.3.12-test-3.tar.bz2 Source1: zshrc Source2: zshenv Source3: zprofile @@ -42,13 +41,9 @@ 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 +Patch1: %{name}-4.3.12-disable-c02cond-test.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 +Patch2: %{name}-4.3.12-ksh-emulation-syntax-checking.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} PreReq: %{install_info_prereq} @@ -99,11 +94,9 @@ mechanism, and more. This package contains the Zsh manual in html format. %prep -%setup -q +%setup -q -n %{name}-4.3.12-test-3 %patch1 %patch2 -p1 -%patch3 -p1 -%patch4 -p1 ##rpmlint # spurious-executable-perm @@ -257,9 +250,6 @@ fi fi %endif -%clean -rm -rf %{buildroot} - %files %defattr(-,root,root) %doc ChangeLog FEATURES LICENCE MACHINES META-FAQ NEWS README From e21ca8a6d231e8f7dd6abbdb04ccb995b4d3b4f66b0c8adf560c748e9936cd8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Tue, 29 Nov 2011 14:19:15 +0000 Subject: [PATCH 2/5] - Cleanup spec file - Make /bin/zsh a symlink to /usr/bin/zsh OBS-URL: https://build.opensuse.org/package/show/shells/zsh?expand=0&rev=81 --- zsh.changes | 6 ++++++ zsh.spec | 22 ++++++++++------------ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/zsh.changes b/zsh.changes index 1a2a245..4a29869 100644 --- a/zsh.changes +++ b/zsh.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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 diff --git a/zsh.spec b/zsh.spec index d1259ce..39456f9 100644 --- a/zsh.spec +++ b/zsh.spec @@ -46,13 +46,15 @@ Patch1: %{name}-4.3.12-disable-c02cond-test.patch Patch2: %{name}-4.3.12-ksh-emulation-syntax-checking.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 @@ -60,9 +62,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 @@ -98,8 +100,7 @@ This package contains the Zsh manual in html format. %patch1 %patch2 -p1 -##rpmlint -# spurious-executable-perm +# Remove executable bit chmod 0644 Etc/changelog2html.pl %if 0%{?rhel_version} || 0%{?centos_version} || 0%{?fedora_version} @@ -113,7 +114,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/ \ @@ -153,7 +153,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} @@ -169,7 +169,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} @@ -185,8 +185,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-* @@ -265,14 +264,13 @@ fi %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 From b0eb86fe996f26d3227d9d413b714b966f81df108ec7f81a5f7afb9536886eb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Wed, 30 Nov 2011 21:53:20 +0000 Subject: [PATCH 3/5] - Update to zsh 4.2.13 * See included ChangeLog for details - Drop zsh-4.3.12-ksh-emulation-syntax-checking.patch, fixed upstream OBS-URL: https://build.opensuse.org/package/show/shells/zsh?expand=0&rev=82 --- zsh-4.3.12-ksh-emulation-syntax-checking.patch | 15 --------------- zsh-4.3.12-test-3.tar.bz2 | 3 --- zsh-4.3.13.tar.bz2 | 3 +++ zsh.changes | 8 ++++++++ zsh.spec | 9 +++------ 5 files changed, 14 insertions(+), 24 deletions(-) delete mode 100644 zsh-4.3.12-ksh-emulation-syntax-checking.patch delete mode 100644 zsh-4.3.12-test-3.tar.bz2 create mode 100644 zsh-4.3.13.tar.bz2 diff --git a/zsh-4.3.12-ksh-emulation-syntax-checking.patch b/zsh-4.3.12-ksh-emulation-syntax-checking.patch deleted file mode 100644 index 1eb08b2..0000000 --- a/zsh-4.3.12-ksh-emulation-syntax-checking.patch +++ /dev/null @@ -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; - } diff --git a/zsh-4.3.12-test-3.tar.bz2 b/zsh-4.3.12-test-3.tar.bz2 deleted file mode 100644 index d22e2ad..0000000 --- a/zsh-4.3.12-test-3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:47bd04cb35933d2a9d70fb8301f7dc08e55da4a80f4f79c7d70a9423d617aa11 -size 2965438 diff --git a/zsh-4.3.13.tar.bz2 b/zsh-4.3.13.tar.bz2 new file mode 100644 index 0000000..433b55d --- /dev/null +++ b/zsh-4.3.13.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:173bafa9f363050de40c50492eccbd8c55d85401a42b076b2178c2d9d5355d9c +size 2964918 diff --git a/zsh.changes b/zsh.changes index 4a29869..d811f01 100644 --- a/zsh.changes +++ b/zsh.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Nov 30 21:49:26 UTC 2011 - idoenmez@suse.de + +- Update to zsh 4.2.13 + * 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 diff --git a/zsh.spec b/zsh.spec index 39456f9..e25ba28 100644 --- a/zsh.spec +++ b/zsh.spec @@ -18,7 +18,7 @@ Name: zsh -Version: 4.3.12+test3 +Version: 4.3.13 Release: 4 License: BSD Summary: Shell with comprehensive completion @@ -28,7 +28,7 @@ Group: System/Shells %else Group: System Environment/Shells %endif -Source0: ftp://ftp.zsh.org/pub/development/zsh-4.3.12-test-3.tar.bz2 +Source0: ftp://ftp.zsh.org/pub/zsh-%{version}.tar.bz2 Source1: zshrc Source2: zshenv Source3: zprofile @@ -42,8 +42,6 @@ Source16: dotzshrc.rh Source17: zshprompt.pl %endif Patch1: %{name}-4.3.12-disable-c02cond-test.patch -# PATCH-FIX ksh-emulation-syntax-checking.patch -- Import and rework from RHEL (zsh-4.2.6) -Patch2: %{name}-4.3.12-ksh-emulation-syntax-checking.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} Requires(pre): %{install_info_prereq} @@ -96,9 +94,8 @@ mechanism, and more. This package contains the Zsh manual in html format. %prep -%setup -q -n %{name}-4.3.12-test-3 +%setup -q -n %{name}-%{version} %patch1 -%patch2 -p1 # Remove executable bit chmod 0644 Etc/changelog2html.pl From 310be89942e113c3894af7966735dd84144fffdf86992cfe6867d078d6dbef5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Thu, 1 Dec 2011 07:08:25 +0000 Subject: [PATCH 4/5] - OBS-URL: https://build.opensuse.org/package/show/shells/zsh?expand=0&rev=83 --- zsh.changes | 2 ++ 1 file changed, 2 insertions(+) diff --git a/zsh.changes b/zsh.changes index d811f01..8d2211b 100644 --- a/zsh.changes +++ b/zsh.changes @@ -2,6 +2,8 @@ Wed Nov 30 21:49:26 UTC 2011 - idoenmez@suse.de - Update to zsh 4.2.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 From df01f973e28a3e995574a70286b9079f64671b25c854fb45dabefba72ff7bf71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Thu, 1 Dec 2011 10:15:53 +0000 Subject: [PATCH 5/5] Whoops OBS-URL: https://build.opensuse.org/package/show/shells/zsh?expand=0&rev=84 --- zsh.changes | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zsh.changes b/zsh.changes index 8d2211b..3fa7949 100644 --- a/zsh.changes +++ b/zsh.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Wed Nov 30 21:49:26 UTC 2011 - idoenmez@suse.de -- Update to zsh 4.2.13 +- 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 @@ -17,7 +17,7 @@ Tue Nov 29 14:19:04 UTC 2011 - idoenmez@suse.de ------------------------------------------------------------------- Mon Nov 28 08:36:51 UTC 2011 - idoenmez@suse.de -- Update to 4.2.12-test3 +- Update to 4.3.12-test3 * See included ChangeLog for details - Drop zsh-findproc.patch and zsh-kill-suspended-job.patch, fixed upstream.