Hello community, here is the log from the commit of package zsh for openSUSE:Factory checked in at Fri Apr 29 09:15:37 CEST 2011. -------- --- zsh/zsh.changes 2011-03-15 15:12:06.000000000 +0100 +++ /mounts/work_src_done/STABLE/zsh/zsh.changes 2011-04-26 17:46:21.000000000 +0200 @@ -1,0 +2,16 @@ +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 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- _make _service _service:download_url:zsh-4.3.11-doc.tar.bz2 _service:download_url:zsh-4.3.11.tar.bz2 subst-crash.patch New: ---- zsh-4.3.11-dev-2.tar.bz2 zsh-4.3.11-disable-c02cond-test.patch zsh-4.3.11-fix-a01grammar.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zsh.spec ++++++ --- /var/tmp/diff_new_pack.tnQS6w/_old 2011-04-29 09:11:02.000000000 +0200 +++ /var/tmp/diff_new_pack.tnQS6w/_new 2011-04-29 09:11:02.000000000 +0200 @@ -15,40 +15,38 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: zsh -Version: 4.3.11 -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} +Version: 4.3.11_dev_2 +Release: 1 +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,17 +56,14 @@ 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 \ @@ -80,32 +75,17 @@ 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 @@ # 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 @@ %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/ ++++++ zsh-4.3.11-disable-c02cond-test.patch ++++++ --- 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 ++++++ zsh-4.3.11-fix-a01grammar.patch ++++++ --- 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 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org