- Add custom completion support via /etc/zsh_completion.d

- Fix build with new ncurses library

OBS-URL: https://build.opensuse.org/package/show/shells/zsh?expand=0&rev=77

zsh.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Nov 24 09:00:37 UTC 2011 - idoenmez@suse.de
+
+- Add custom completion support via /etc/zsh_completion.d 
+- Fix build with new ncurses library
+
 -------------------------------------------------------------------
 Mon Aug  1 23:17:10 UTC 2011 - crrodriguez@opensuse.org
 

zsh.spec

@@ -19,7 +19,7 @@
 
 Name:           zsh
 Version:        4.3.12
-Release:        2
+Release:        4
 License:        BSD
 Summary:        Shell with comprehensive completion
 Url:            http://www.zsh.org
@@ -57,7 +57,7 @@ BuildRequires:  fdupes
 BuildRequires:  yodl
 %endif
 %else
-Prereq:         fileutils grep /sbin/install-info
+PreReq:         fileutils grep /sbin/install-info
 %endif
 
 BuildRequires:  libcap-devel
@@ -79,6 +79,7 @@ at home, and extra features drawn from tcsh (another `custom' shell).
 Zsh is well known for its command line completion.
 
 %package htmldoc
+
 Summary:        Zsh shell manual in html format
 %if 0%{?suse_version}
 Group:          System/Shells
@@ -128,7 +129,11 @@ perl -p -i -e 's|/usr/local/bin|%{_bindir}|' \
     --enable-cap \
     --enable-multibyte \
     --enable-pcre \
-    --with-term-lib=ncursesw \
+%if 0%{?suse_version} >= 1220
+    --with-term-lib="ncursesw tinfo" \
+%else
+    --with-term-lib="ncursesw" \
+%endif
     --enable-cflags="%{optflags} %(ncursesw6-config --cflags)" \
     --enable-ldflags="%(ncursesw6-config --libs)"
 
@@ -153,7 +158,6 @@ mv Doc/*.html Doc/htmldoc
 # remove some unwanted files in Etc/
 rm -f Etc/Makefile* Etc/*.yo
 
-
 %install
 %if 0%{?rhel_version} || 0%{?centos_version} || 0%{?fedora_version}
   rm -rf %{buildroot}
@@ -170,6 +174,9 @@ install -m 0755 -Dd  %{buildroot}/{etc,bin}
 %if 0%{?suse_version}
 # install SUSE configuration
 install -m 0644 %{SOURCE1} %{SOURCE2} %{SOURCE3} %{buildroot}%{_sysconfdir}
+
+# Create custom completion directory
+mkdir %{buildroot}/etc/zsh_completion.d
 %endif
 
 %if 0%{?rhel_version} || 0%{?centos_version} || 0%{?fedora_version}
@@ -267,6 +274,10 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/skel/.zshrc
 %endif
 
+%if 0%{?suse_version}
+%dir /etc/zsh_completion.d
+%endif
+
 %{_bindir}/zsh
 /bin/zsh
 %{_libdir}/zsh/

zshrc

@@ -2,6 +2,11 @@
 # to re-implement here
 source /etc/bash.bashrc
 
+# Custom completion support via /etc/zsh_completion.d
+for i in /etc/zsh_completion.d/*(N); do 
+    test -r $i && . $i
+done
+
 # zsh line editing
 : ${ZSHEDIT:="emacs"}
 : ${TERM:=linux}