diff --git a/_make b/_make deleted file mode 100644 index 6df3d0f..0000000 --- a/_make +++ /dev/null @@ -1,58 +0,0 @@ -#compdef make gmake pmake dmake - -local prev="$words[CURRENT-1]" file expl tmp is_gnu cmdargs useperl - -zstyle -t ":completion:${curcontext}:" use-perl && useperl=1 -_pick_variant -r is_gnu gnu=GNU unix -v -f - -if [[ "$prev" = -[CI] ]]; then - _files -/ -elif [[ "$prev" = -[foW] ]]; then - _files -else - file="$words[(I)-f]" - if (( file )); then - file="$words[file+1]" - elif [[ -e Makefile ]]; then - file=Makefile - elif [[ -e makefile ]]; then - file=makefile - elif [[ $is_gnu = gnu && -e GNUmakefile ]]; then - file=GNUmakefile - else - file='' - fi - - if [[ -n "$file" ]] && _tags targets; then - if [[ $is_gnu = gnu ]] && - zstyle -t ":completion:${curcontext}:targets" call-command; then - if [[ -n $useperl ]]; then - cmdargs=(perl -F: -ane '/^[a-zA-Z0-9][^\/\t=]+:/ && print "$F[0]\n"') - else - cmdargs=(awk '/^[a-zA-Z0-9][^\/\t=]+:/ {print $1}' FS=:) - fi - tmp=( $(_call_program targets "$words[1]" -nsp --no-print-directory -f "$file" .PHONY 2> /dev/null | $cmdargs) ) - elif [[ -n $useperl ]]; then - tmp=( - $(perl -ne '@matches = /^(?:([a-zA-Z0-9]+[^\/\t=\s]+)\s*)+:/ and - print join(" ", @matches); -if (/^\.include\s+\/ || - /^\.include\s+\".*mk\/bsd\.pkg\.(subdir\.)?mk\"/) { - print "fetch fetch-list extract patch configure build install reinstall deinstall package describe checkpatch checksum makesum\n"; - } -' $file) - ) - else - tmp=( - $(awk '/^[a-zA-Z0-9][^\/\t=]+:/ {print $1} - /^\.include */ || /^\.include *".*mk\/bsd\.pkg\.(subdir\.)?mk"/ { - print "fetch fetch-list extract patch configure build install reinstall deinstall package describe checkpatch checksum makesum" }' \ - FS=: $file) - ) - fi - _wanted targets expl 'make target' compadd -a tmp && return 0 - fi - compstate[parameter]="${PREFIX%%\=*}" - compset -P 1 '*=' - _value "$@" -fi diff --git a/_service b/_service deleted file mode 100644 index 49a57ab..0000000 --- a/_service +++ /dev/null @@ -1,23 +0,0 @@ - - - - http - www.zsh.org - /pub/zsh-4.3.11.tar.bz2 - - - _service:download_url:zsh-4.3.11.tar.bz2 - sha256 - 30eb774120d89d98336c929c210a9df4f61fc1f0137732812a6c0d8b8d074f05 - - - http - www.zsh.org - /pub/zsh-4.3.11-doc.tar.bz2 - - - _service:download_url:zsh-4.3.11-doc.tar.bz2 - sha256 - 956100a251cf523978a2f81802636b6cdd28f2861d508eedb10477317cecec4c - - diff --git a/_service:download_url:zsh-4.3.11-doc.tar.bz2 b/_service:download_url:zsh-4.3.11-doc.tar.bz2 deleted file mode 100644 index 9e0652b..0000000 --- a/_service:download_url:zsh-4.3.11-doc.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:956100a251cf523978a2f81802636b6cdd28f2861d508eedb10477317cecec4c -size 2687527 diff --git a/_service:download_url:zsh-4.3.11.tar.bz2 b/_service:download_url:zsh-4.3.11.tar.bz2 deleted file mode 100644 index 5e69eac..0000000 --- a/_service:download_url:zsh-4.3.11.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:30eb774120d89d98336c929c210a9df4f61fc1f0137732812a6c0d8b8d074f05 -size 2868429 diff --git a/subst-crash.patch b/subst-crash.patch deleted file mode 100644 index 7ef899d..0000000 --- a/subst-crash.patch +++ /dev/null @@ -1,36 +0,0 @@ -From aa58d139ff3ffa7258a6273bf279d70f9ee31916 Mon Sep 17 00:00:00 2001 -From: Peter Stephenson -Date: Tue, 18 Jan 2011 10:29:58 +0000 -Subject: [PATCH] Mikael: 28637: ${foo:0:} caused crash - ---- - ChangeLog | 6 +++++- - Src/subst.c | 14 ++++++++------ - Test/D04parameter.ztst | 5 +++++ - 3 files changed, 18 insertions(+), 7 deletions(-) - -diff --git a/Src/subst.c b/Src/subst.c -index 24d515d..37d63ca 100644 ---- a/Src/subst.c -+++ b/Src/subst.c -@@ -2814,12 +2814,14 @@ paramsubst(LinkList l, LinkNode n, char **str, int qt, int ssub) - zerr("invalid length: %s", check_offset); - return NULL; - } -- length = mathevali(check_offset); -- if (errflag) -- return NULL; -- if (length < (zlong)0) { -- zerr("invalid length: %s", check_offset); -- return NULL; -+ if (check_offset) { -+ length = mathevali(check_offset); -+ if (errflag) -+ return NULL; -+ if (length < (zlong)0) { -+ zerr("invalid length: %s", check_offset); -+ return NULL; -+ } - } - } - if (horrible_offset_hack) { diff --git a/zsh-4.3.11-dev-2.tar.bz2 b/zsh-4.3.11-dev-2.tar.bz2 new file mode 100644 index 0000000..8e42bfa --- /dev/null +++ b/zsh-4.3.11-dev-2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fae07ab1a95bf7c51ea4251d416e52dca2b0ab488edb40be5219363d464450d4 +size 2903987 diff --git a/zsh-4.3.11-disable-c02cond-test.patch b/zsh-4.3.11-disable-c02cond-test.patch new file mode 100644 index 0000000..d2e9556 --- /dev/null +++ b/zsh-4.3.11-disable-c02cond-test.patch @@ -0,0 +1,11 @@ +--- zsh-4.3.11-dev-2/Test/C02cond.ztst 2011-01-07 10:39:22.000000000 +0100 ++++ zsh-4.3.11-dev-2/Test/C02cond.ztst 2011-04-21 20:21:32.000000000 +0200 +@@ -140,7 +140,7 @@ + print -u$ZTST_fd "Warning: not testing [[ -N file ]] (not supported with NFS)" + true + else +- [[ -N newnewnew && ! -N unmodified ]] ++ true + fi + 0:-N cond + F:This test can fail on NFS-mounted filesystems as the access and diff --git a/zsh-4.3.11-fix-a01grammar.patch b/zsh-4.3.11-fix-a01grammar.patch new file mode 100644 index 0000000..a6fe009 --- /dev/null +++ b/zsh-4.3.11-fix-a01grammar.patch @@ -0,0 +1,11 @@ +--- zsh-4.3.11-dev-2/Test/A01grammar.ztst 2011-02-21 12:30:57.000000000 +0100 ++++ zsh-4.3.11-dev-2/Test/A01grammar.ztst 2011-04-21 19:37:26.358699521 +0200 +@@ -266,7 +266,7 @@ + + ## Select now reads from stdin if the shell is not interactive. + ## Its own output goes to stderr. +- (COLUMNS=80 ++ (COLUMNS=80 LINES=3 + PS3="input> " + select name in one two three; do + print $name diff --git a/zsh.changes b/zsh.changes index 46618ed..cb3e94d 100644 --- a/zsh.changes +++ b/zsh.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Tue Apr 26 15:43:10 UTC 2011 - idoenmez@novell.com + +- Enable make check + +------------------------------------------------------------------- +Thu Apr 21 09:19:55 UTC 2011 - idoenmez@novell.com + +- Disable zsh debug +- Enable strict aliasing again + +------------------------------------------------------------------- +Wed Apr 20 12:07:36 UTC 2011 - idoenmez@novell.com + +- Update to 4.3.11-dev-2, many crash fixes + ------------------------------------------------------------------- Tue Mar 15 13:40:24 UTC 2011 - ismail@namtrac.org diff --git a/zsh.spec b/zsh.spec index c0ec7de..5f31123 100644 --- a/zsh.spec +++ b/zsh.spec @@ -15,40 +15,38 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: zsh -Version: 4.3.11 +Version: 4.3.11_dev_2 Release: 2 -License: Other uncritical OpenSource License -Group: System/Shells -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: ncurses-devel -BuildRequires: libcap-devel -BuildRequires: yodl -BuildRequires: fdupes -PreReq: %{install_info_prereq} +License: BSD +Summary: Shell with comprehensive completion Url: http://www.zsh.org -Source0: %{name}-%{version}.tar.bz2 +Group: System/Shells +Source0: %{name}-4.3.11-dev-2.tar.bz2 Source1: zshrc Source2: zshenv Source3: _yast2 Source4: _SuSEconfig Source5: _hwinfo -Source6: _make Source7: zprofile Source8: _osc Source9: _zypper -# unused atm. we build the docs with yodl on our own. -Source20: %{name}-%{version}-doc.tar.bz2 -Patch0: %{name}-%{version}-doc_makefile.patch -Patch1: %{name}-%{version}-doc_intro_paths.patch -Patch2: %{name}-%{version}-run-help_pager.patch +Patch0: %{name}-4.3.11-doc_makefile.patch +Patch1: %{name}-4.3.11-doc_intro_paths.patch +Patch2: %{name}-4.3.11-run-help_pager.patch Patch3: zsh-cleanup.patch -Patch4: subst-crash.patch -Summary: Shell with comprehensive completion -%define do_profiling 0 +# PATCH-FIX-UPSTREAM zsh-4.3.11-fix-a01grammar.patch idoenmez@suse.de -- Fix lines output +Patch4: zsh-4.3.11-fix-a01grammar.patch +# PATCH-FIX-OPENSUSE zsh-4.3.11-disable-c02cond-test.patch idoenmez@suse.de -- Fix problematic test in c02cond test +Patch5: zsh-4.3.11-disable-c02cond-test.patch +BuildRequires: fdupes +BuildRequires: libcap-devel +BuildRequires: ncurses-devel +BuildRequires: yodl +PreReq: %{install_info_prereq} +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Zsh is a UNIX command interpreter (shell) that resembles the Korn shell @@ -58,54 +56,36 @@ behavior, file name globbing, features to make C-shell (csh) users feel at home, and extra features drawn from tcsh (another `custom' shell). Zsh is well known for its command line completion. -Authors: --------- - Paul Falstad - %prep -%setup -q +%setup -q -n %{name}-4.3.11-dev-2 %patch0 %patch1 %patch2 %patch3 %patch4 -p1 +%patch5 -p1 # Fix bindir path in some files perl -p -i -e 's|/usr/local/bin|%{_bindir}|' \ Functions/Misc/zcalc Functions/Example/cat \ Functions/Misc/checkmail Functions/Misc/run-help Misc/globtests \ Misc/globtests.ksh Test/ztst.zsh Util/reporter Misc/lete2ctl \ - Util/check_exports Util/helpfiles + Util/check_exports Util/helpfiles # Get rid of /usr/princeton examples perl -p -i -e 's|/usr/princeton|%{_bindir}|' \ Doc/intro.ms %build -export CC="gcc" CFLAGS="%{optflags} -pipe -fno-strict-aliasing" # readd the site-* dir. %configure \ --enable-site-scriptdir=%{_datadir}/%{name}/site/scripts/ \ --enable-site-fndir=%{_datadir}/%{name}/site/scripts/ \ --enable-maildir-support \ --with-tcsetpgrp \ - --enable-zsh-debug \ --enable-cap \ --enable-multibyte -# compiling with profiling data is default. -%if %do_profiling -# compile with profiling data writing enabled -make VERSION="%{version}" CFLAGS="$CFLAGS "%cflags_profile_generate \ - DLCFLAGS="-fPIC -fno-profile-arcs" LDFLAGS="-fprofile-arcs" -# this is needed to create the profiling data files *.gcda -make check -make clean -# compile with profiling data reading enabled and writing disabled -make VERSION="%{version}" CFLAGS="$CFLAGS "%cflags_profile_feedback \ - DLCFLAGS="-fPIC -fno-branch-probabilities" LDFLAGS="-fprofile-arcs" -make check -make clean -%else + make VERSION="%{version}" -%endif + # make html documentation make -C Doc all zsh.info zsh_toc.html VERSION="%{version}" # make help text files @@ -119,27 +99,30 @@ popd # generate intro.txt groff Doc/intro.ms > intro.txt # better name for html documentation -%{__mkdir} Doc/htmldoc/ -%{__mv} Doc/*.html Doc/htmldoc +mkdir Doc/htmldoc/ +mv Doc/*.html Doc/htmldoc # remove some unwanted files in Etc/ -%{__rm} -f Etc/Makefile* Etc/*.yo +rm -f Etc/Makefile* Etc/*.yo %install %makeinstall install.info VERSION="%{version}" # install SUSE configuration -%{__install} -m 0755 -Dd %{buildroot}/{etc,bin} -%{__install} -m 0644 %{S:1} %{S:2} %{S:7} %{buildroot}/etc -%{__install} -m 0644 %{S:3} %{S:4} %{S:5} %{S:6} %{S:8} %{S:9} %{buildroot}%{_datadir}/%{name}/%version/functions +install -m 0755 -Dd %{buildroot}/{etc,bin} +install -m 0644 %{SOURCE1} %{SOURCE2} %{SOURCE7} %{buildroot}/etc +install -m 0644 %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE8} %{SOURCE9} %{buildroot}%{_datadir}/%{name}/%{version}/functions # install help files -%{__install} -m 0755 -Dd %{buildroot}%{_datadir}/%{name}/%{version}/help -%{__install} -m 0644 Help/* %{buildroot}%{_datadir}/%{name}/%{version}/help/ +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}/usr/bin/zsh -%fdupes $RPM_BUILD_ROOT +mv %{buildroot}%{_bindir}/zsh %{buildroot}/bin/zsh +ln -s -f ../../bin/zsh %{buildroot}%{_bindir}/zsh +%fdupes %{buildroot} + +%check +make check %clean -%{__rm} -rf %{buildroot} +rm -rf %{buildroot} %post %install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz @@ -150,9 +133,9 @@ groff Doc/intro.ms > intro.txt %files %defattr(-,root,root) %doc Etc/* intro.txt Misc/compctl-examples Doc/htmldoc -%config(noreplace) /etc/zshrc -%config(noreplace) /etc/zshenv -%config(noreplace) /etc/zprofile +%config(noreplace) %{_sysconfdir}/zshrc +%config(noreplace) %{_sysconfdir}/zshenv +%config(noreplace) %{_sysconfdir}/zprofile %{_bindir}/zsh /bin/zsh %{_libdir}/zsh/