Browse Source

zsh 5.0.7-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@9925 ec354946-7b23-47d6-9f5a-488ba84defc7
iwaim 8 years ago
parent
commit
651864d702
1 changed files with 14 additions and 22 deletions
  1. 14 22
      z/zsh/zsh-vl.spec

+ 14 - 22
z/zsh/zsh-vl.spec

@@ -1,10 +1,10 @@
 # -*- Mode: rpm-spec -*-
 
 %define name zsh
-%define version 5.0.2
+%define version 5.0.7
 %define rversion %{version}
 %define dversion %{version}
-%define release 2%{?_dist_release}
+%define release 1%{?_dist_release}
 %define url ftp://ftp.zsh.org/pub/
 ## %define _sysconfdir /etc
 
@@ -18,17 +18,17 @@ Group: System Environment/Shells
 Url: http://www.zsh.org
 Source0: %{url}/%{name}-%{rversion}.tar.bz2
 Source1: zcfg-vine.tar.bz2
-Source3: http://www.pwstephenson.fsnet.co.uk/computing/zshguide.tar.bz2
 # fixed that _apt fail  completions rpm package name. 
 Patch0: zsh-4.3.4-apt4rpm.patch
 Patch1: zsh-4.3.4-sshcomp.patch
 Patch2: zsh-4.2.0-completion_tar_archive.patch
-Patch3: zsh-4.3.10-fixpath.patch
+Patch3: zsh-5.0.7-fixpath.patch
 Requires(post,preun): /sbin/install-info
 Requires(post,postun): grep
 BuildRoot: %{_tmppath}/%{name}-buildroot
 BuildRequires: texinfo, ncurses-devel
 BuildRequires: findutils grep
+BuildRequires: man-db
 
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -87,7 +87,8 @@ make
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall fndir=%{buildroot}%{_datadir}/zsh/functions sitefndir=%{buildroot}%{_datadir}/zsh/site-functions scriptdir=%{buildroot}%{_datadir}/zsh/scripts sitescriptdir=%{buildroot}%{_datadir}/zsh/site-scripts
+%makeinstall fndir=%{buildroot}%{_datadir}/zsh/functions sitefndir=%{buildroot}%{_datadir}/zsh/site-functions scriptdir=%{buildroot}%{_datadir}/zsh/scripts sitescriptdir=%{buildroot}%{_datadir}/zsh/site-scripts \
+             runhelpdir=%{buildroot}%{_datadir}/zsh/${VERSION}/help
 
 make install.info DESTDIR=$RPM_BUILD_ROOT
 
@@ -111,11 +112,6 @@ cp -a Etc/* docroot/Documentation
 cp -a NEWS docroot/
 #cp -a Doc/*html docroot/Info_html/
 
-mkdir -p docroot/Zsh_Guide
-bzcat %{SOURCE3}|tar xf - -C docroot/Zsh_Guide
-mv docroot/Zsh_Guide/zshguide/*html docroot/Zsh_Guide/
-rmdir docroot/Zsh_Guide/zshguide
-
 find docroot/ -type f|xargs perl -p -i -e 's|^#!%{prefix}/local/bin/zsh|#!%{_bi
 ndir}/zsh|'
 find docroot/ -type f|xargs perl -p -i -e 's|^#!%{prefix}/local/bin/perl|#!%{_b
@@ -126,17 +122,6 @@ rm -f docroot/Examples/{Makefile*,*.yo}
 rm -f docroot/Documentation/{Makefile*,*.yo}
 mv docroot/Examples/compctl-examples docroot/StartupFiles
 
-#Build Helpdir
-mkdir -p %{buildroot}%{_datadir}/zsh/
-
-rm -rf help && mkdir help/ && pushd help && {
-    echo "Build Documentation"
-    make -C ../Doc/ zshbuiltins.1
-    man ../Doc/zshbuiltins.1|colcrt -|perl ../Util/helpfiles
-} && popd
-
-mv help %{buildroot}%{_datadir}/zsh
-
 find docroot/ -name 'Makefile*' -o -name '.yo'|xargs rm -f
 
 %clean
@@ -166,7 +151,6 @@ fi
 %doc LICENCE
 %doc docroot/README docroot/NEWS
 %doc docroot/Documentation/ docroot/Examples/ docroot/Info_html/ docroot/StartupFiles/
-%doc docroot/Zsh_Guide
 %config %{_sysconfdir}/z*
 %{_sysbindir}/zsh
 %{_bindir}/zsh*
@@ -177,6 +161,14 @@ fi
 %{_datadir}/zsh
 
 %changelog
+* Thu Jan  1 2014 IWAI, Masaharu <iwaim.sub@gmail.com> 5.0.7-1
+- update to 5.0.7
+- add BuildRequires: man-db
+- update fixpath patch (Patch3)
+- add install path 'runhelpdir'
+- add help files
+- drop too old Zsh Guide (Source3)
+
 * Tue Dec 31 2013 IWAI, Masaharu <iwaim.sub@gmail.com> 5.0.2-2
 - rebuild with current VineSeed