Hello community,

here is the log from the commit of package zsh for openSUSE:Factory
checked in at Mon Jun 6 13:16:13 CEST 2011.



--------
--- zsh/zsh.changes     2011-04-26 17:46:21.000000000 +0200
+++ /mounts/work_src_done/STABLE/zsh/zsh.changes        2011-06-01 
15:36:23.000000000 +0200
@@ -1,0 +2,6 @@
+Wed Jun  1 13:17:38 UTC 2011 - idon...@novell.com
+
+- Update to zsh 4.3.12 
+- Dropped openSUSE specific completions, all are upstreamed now
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


Old:
----
  _SuSEconfig
  _hwinfo
  _osc
  _yast2
  _zypper
  zsh-4.3.11-dev-2.tar.bz2
  zsh-4.3.11-disable-c02cond-test.patch
  zsh-4.3.11-doc_intro_paths.patch
  zsh-4.3.11-doc_makefile.patch
  zsh-4.3.11-fix-a01grammar.patch
  zsh-4.3.11-run-help_pager.patch
  zsh-cleanup.patch

New:
----
  zsh-4.3.12-disable-c02cond-test.patch
  zsh-4.3.12.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ zsh.spec ++++++
--- /var/tmp/diff_new_pack.MDrdWS/_old  2011-06-06 13:14:40.000000000 +0200
+++ /var/tmp/diff_new_pack.MDrdWS/_new  2011-06-06 13:14:40.000000000 +0200
@@ -18,29 +18,17 @@
 
 
 Name:           zsh
-Version:        4.3.11_dev_2
+Version:        4.3.12
 Release:        1
 License:        BSD
 Summary:        Shell with comprehensive completion
 Url:            http://www.zsh.org
 Group:          System/Shells
-Source0:        %{name}-4.3.11-dev-2.tar.bz2
+Source0:        %{name}-%{version}.tar.bz2
 Source1:        zshrc
 Source2:        zshenv
-Source3:        _yast2
-Source4:        _SuSEconfig
-Source5:        _hwinfo
-Source7:        zprofile
-Source8:        _osc
-Source9:        _zypper
-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
-# PATCH-FIX-UPSTREAM zsh-4.3.11-fix-a01grammar.patch idoen...@suse.de -- Fix 
lines output
-Patch4:         zsh-4.3.11-fix-a01grammar.patch
-# PATCH-FIX-OPENSUSE zsh-4.3.11-disable-c02cond-test.patch idoen...@suse.de -- 
Fix problematic test in c02cond test
-Patch5:         zsh-4.3.11-disable-c02cond-test.patch
+Source3:        zprofile
+Patch1:         %{name}-%{version}-disable-c02cond-test.patch
 BuildRequires:  fdupes
 BuildRequires:  libcap-devel
 BuildRequires:  ncurses-devel
@@ -57,22 +45,14 @@
 Zsh is well known for its command line completion.
 
 %prep
-%setup -q -n %{name}-4.3.11-dev-2
-%patch0
+%setup -q
 %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
-# Get rid of /usr/princeton examples
-perl -p -i -e 's|/usr/princeton|%{_bindir}|' \
-    Doc/intro.ms
+    Doc/intro.ms Misc/globtests.ksh Misc/globtests \
+    Misc/lete2ctl Util/check_exports Util/helpfiles \
+    Util/reporter
 
 %build
 # readd the site-* dir.
@@ -84,10 +64,11 @@
     --enable-cap \
     --enable-multibyte
 
-make VERSION="%{version}"
+make
 
 # make html documentation
-make -C Doc all zsh.info zsh_toc.html VERSION="%{version}"
+make -C Doc all zsh.info zsh_toc.html
+
 # make help text files
 mkdir -p Help
 pushd Help/
@@ -96,26 +77,35 @@
        sed -e 's/±/{+|-}/' | \
        ../Util/helpfiles
 popd
-# generate intro.txt
-groff Doc/intro.ms > intro.txt
+
+# generate intro.ps
+groff -Tps -ms Doc/intro.ms > intro.ps
+
 # better name for html documentation
 mkdir Doc/htmldoc/
 mv Doc/*.html Doc/htmldoc
+
 # remove some unwanted files in Etc/
 rm -f Etc/Makefile* Etc/*.yo
 
 %install
-%makeinstall install.info VERSION="%{version}"
+%makeinstall install.info
+
 # install SUSE configuration
 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 -m 0644 %{SOURCE1} %{SOURCE2} %{SOURCE3} %{buildroot}/etc
+
 # install help files
 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
+
+# Remove versioned zsh binary
+rm -f %{buildroot}%{_bindir}/zsh-*
+
 %fdupes %{buildroot}
 
 %check
@@ -132,7 +122,7 @@
 
 %files
 %defattr(-,root,root)
-%doc Etc/* intro.txt Misc/compctl-examples Doc/htmldoc
+%doc Etc/* intro.ps Misc/compctl-examples Doc/htmldoc
 %config(noreplace) %{_sysconfdir}/zshrc
 %config(noreplace) %{_sysconfdir}/zshenv
 %config(noreplace) %{_sysconfdir}/zprofile

++++++ zsh-4.3.11-disable-c02cond-test.patch -> 
zsh-4.3.12-disable-c02cond-test.patch ++++++
--- zsh/zsh-4.3.11-disable-c02cond-test.patch   2011-04-21 20:22:39.000000000 
+0200
+++ /mounts/work_src_done/STABLE/zsh/zsh-4.3.12-disable-c02cond-test.patch      
2011-05-21 11:54:17.000000000 +0200
@@ -1,5 +1,5 @@
---- 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
+--- Test/C02cond.ztst  2011-01-07 10:39:22.000000000 +0100
++++ 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

++++++ zsh-4.3.11-dev-2.tar.bz2 -> zsh-4.3.12.tar.bz2 ++++++
++++ 10189 lines of diff (skipped)


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to