diff --git a/_SuSEconfig b/_SuSEconfig deleted file mode 100644 index d0e8192..0000000 --- a/_SuSEconfig +++ /dev/null @@ -1,28 +0,0 @@ -#compdef SuSEconfig - -local curcontext="$curcontext" state line -typeset -A opt_args - -if [[ -z "$_SuSEconfig_modules" ]]; then - for i in /sbin/conf.d/SuSEconfig.*; do - case $i in *.rpm*|*.swap|*.bak|*.orig|*~|\#*) continue;; esac - _SuSEconfig_modules=($_SuSEconfig_modules ${i##*/SuSEconfig.}) - done -fi - - -_arguments \ - '--help' \ - '--quick' \ - '--force' \ - '--verbose' \ - '--nonewpackage' \ - '--module:module:->module' && return 0 - -case $state in - module) compadd $_SuSEconfig_modules ;; -esac - -# Usage: SuSEconfig [--quick|--nonewpackage|--force|--verbose] [--module name] - - diff --git a/_hwinfo b/_hwinfo deleted file mode 100644 index 4c0e9bb..0000000 --- a/_hwinfo +++ /dev/null @@ -1,79 +0,0 @@ -#compdef hwinfo - -_arguments \ - '--help[show usage info]' \ - '--version[show libhd version]' \ - '--short[just a short listing]' \ - '--log[write info to logfile]:logfile:_files' \ - '--debug[set debuglevel]:debuglevels:(1 2 3 4 5 6 7 8 9)' \ - '--dump-db[dump hardware data base, 0: external, 1: internal]:dumpdb:(0 1)' \ - '--bios' \ - '--block' \ - '--bluetooth' \ - '--braille' \ - '--bridge' \ - '--camera' \ - '--cdrom' \ - '--chipcard' \ - '--cpu' \ - '--disk' \ - '--dsl' \ - '--dvb' \ - '--floppy' \ - '--framebuffer' \ - '--gfxcard' \ - '--hub' \ - '--ide' \ - '--isapnp' \ - '--isdn' \ - '--joystick' \ - '--keyboard' \ - '--memory' \ - '--modem' \ - '--monitor' \ - '--mouse' \ - '--netcard' \ - '--network' \ - '--partition' \ - '--pci' \ - '--pcmcia' \ - '--pcmcia-ctrl' \ - '--pppoe' \ - '--printer' \ - '--scanner' \ - '--scsi' \ - '--smp' \ - '--sound' \ - '--storage-ctrl' \ - '--sys' \ - '--tape' \ - '--tv' \ - '--usb' \ - '--usb-ctrl' \ - '--vbe' \ - '--wlan' \ - '--zip' \ - '--all' \ - '--reallyall' && return 0 - - -# hwinfo-9.31-1.1 -# -# Usage: hwinfo [options] -# Probe for hardware. -# --short just a short listing -# --log logfile write info to logfile -# --debug level set debuglevel -# --version show libhd version -# --dump-db n dump hardware data base, 0: external, 1: internal -# --hw_item probe for hw_item -# hw_item is one of: -# all, bios, block, bluetooth, braille, bridge, camera, cdrom, chipcard, cpu, -# disk, dsl, dvb, floppy, framebuffer, gfxcard, hub, ide, isapnp, isdn, -# joystick, keyboard, memory, modem, monitor, mouse, netcard, network, -# partition, pci, pcmcia, pcmcia-ctrl, pppoe, printer, scanner, scsi, smp, -# sound, storage-ctrl, sys, tape, tv, usb, usb-ctrl, vbe, wlan, zip -# -# Note: debug info is shown only in the log file. (If you specify a -# log file the debug level is implicitly set to a reasonable value.) - diff --git a/_osc b/_osc deleted file mode 100644 index 2b47c8e..0000000 --- a/_osc +++ /dev/null @@ -1,149 +0,0 @@ -#compdef osc -# -# Copyright (C) 2009,2010 Holger Macht -# -# This file is released under the GPLv2. -# -# Based on the the zsh guide from http://zsh.dotsrc.org/Guide/zshguide06.html -# -# Toggle verbose completions: zstyle ':completion:*:osc:*' verbose no -# zstyle ':completion:*:osc-subcommand:*' verbose no -# -# Use the variables $ZSH_OSC_BUILD_TARGETS_EXTRA and $ZSH_OSC_PROJECTS_EXTRA to -# extend the list of possible completions in your ~/.zshrc like that: -# export OSC_PROJECTS_EXTRA="Base:System Base:shells" -# -# version 0.2 -# - -OSC_BUILD_TARGETS="openSUSE_10.2 openSUSE_10.3 openSUSE_11.0 openSUSE_11.1 openSUSE_11.2 openSUSE_11.3 openSUSE_Factory" -OSC_PROJECTS="openSUSE:Factory openSUSE:11.2 openSUSE:11.3 openSUSE:11.1 openSUSE:11.0 openSUSE:10.3" - -# user defined variables $OSC_BUILD_TARGETS_EXTRA and -# $OSC_PROJECTS_EXTRA can add to the project/build target list -OSC_BUILD_TARGETS="$OSC_BUILD_TARGETS $ZSH_OSC_BUILD_TARGETS_EXTRA" -OSC_PROJECTS="$OSC_PROJECTS $ZSH_OSC_PROJECTS_EXTRA" - -# Main dispatcher - -_osc() { - if (( CURRENT > 2 )) && [[ ${words[2]} != "help" ]]; then - # Remember the subcommand name - local cmd=${words[2]} - # Set the context for the subcommand. - curcontext="${curcontext%:*:*}:osc-subcommand" - # Narrow the range of words we are looking at to exclude `osc' - (( CURRENT-- )) - shift words - # Run the completion for the subcommand - if [ "$cmd" = "submitreq" -o "$cmd" = "sr" ]; then - _osc_cmd_submitreq - elif [ "$cmd" = "getbinaries" ]; then - _osc_cmd_getbinaries - elif [ "$cmd" = "checkout" -o "$cmd" = "co" -o "$cmd" = "branch" ]; then - _osc_cmd_checkout - elif [ "$cmd" = "buildlog" -o "$cmd" = "buildinfo" -o "$cmd" = "bl" ]; then - _osc_cmd_buildlog - else - _osc_cmd_do $cmd - fi - else - local hline - local -a cmdlist - local tag=0 - _call_program help-commands osc help | while read -A hline; do - # start parsing with "commands:" - [[ $hline[1] = "commands:" ]] && tag=1 - # stop parsing at the line starting with "For" - [[ $hline[1] = "For" ]] && tag=0 - [[ $tag = 0 ]] && continue - # all commands have to start with lower case letters - [[ $hline[1] =~ ^[A-Z] ]] && continue - (( ${#hline} < 2 )) && continue - - # ${hline[1]%,} truncates the last ',' - cmdlist=($cmdlist "${hline[1]%,}:${hline[2,-1]}") - done - _describe -t osc-commands 'osc command' cmdlist - fi -} - -_osc_cmd_getbinaries() { - _arguments \ - '1:PROJECT:( `echo $OSC_PROJECTS` )' \ - '2:PACKAGE:(PACKAGE)' \ - '3:REPOSITORY:( `echo $OSC_BUILD_TARGETS` )' \ - '4:ARCHITECTURE:(i586 x86_64)' -} - -_osc_cmd_checkout() { - _arguments \ - '1:PROJECT:( `echo $OSC_PROJECTS` )' \ - '2:PACKAGE:(PACKAGE)' -} - -_osc_cmd_buildlog() { - _arguments \ - '1:REPOSITORY:( `echo $OSC_BUILD_TARGETS` )' \ - '2:ARCHITECTURE:(i586 x86_64)' -} - -_osc_cmd_submitreq() { - local hline - local -a cmdlist - local tag=0 - _call_program help-commands osc help $cmd | while read -A hline; do - # start parsing from "usage:" - [[ $hline[1] = "usage:" ]] && tag=1 - [[ $tag = 0 ]] && continue - - if [[ $hline[1] =~ ^osc ]]; then - shift hline; shift hline - elif ! [[ $hline[1] =~ ^- ]]; then - # Option has to start with a '-' or 'osc submitrequest' - continue - fi - - (( ${#hline} < 2 )) && continue - - cmdlist=($cmdlist "${hline[1]%,}:${hline[2,-1]}") - - done - - _describe -t osc-commands 'osc command' cmdlist -} - - -_osc_cmd_do() { - local hline - local -a cmdlist - local tag=0 - - # only start completion if theres some '-' on the line - if ! [ "$words[2]" = "-" ]; then - _complete - return - fi - - _call_program help-commands osc help $cmd | while read -A hline; do - # start parsing from "Options:" - [[ $hline[1] = "Options:" ]] && tag=1 - [[ $tag = 0 ]] && continue - # Option has to start with a '-' - [[ $hline[1] =~ ^- ]] || continue - (( ${#hline} < 2 )) && continue - - cmdlist=($cmdlist "${hline[1]%,}:${hline[2,-1]}") - done - - if [ -n "$cmdlist" ]; then - _describe -t osc-commands 'osc command' cmdlist - else - _complete - fi -} - -# Code to make sure _osc is run when we load it -_osc "$@" - - diff --git a/_yast2 b/_yast2 deleted file mode 100644 index 903ab40..0000000 --- a/_yast2 +++ /dev/null @@ -1,30 +0,0 @@ -#compdef yast2 yast - -local curcontext="$curcontext" state line -typeset -A opt_args - -if [[ -z "$_yast2_modules" ]]; then - for i in $(/sbin/yast2 --list | grep -v "Available.*modules"); do - _yast2_modules=($_yast2_modules $i) - done -fi - -_arguments -s \ - '(--list)-l[list all available modules]' '(-l)--list' \ - '(--help)-h[help]' '(-h)--help'\ - \ - {'(--geometry)-g[default window size (qt only)]','(-g)--geometry'}':geometry:(800x600+0+0)' \ - '(--style)-s[widget style (qt only)]' '(-s)--style' \ - \ - {'(--install)-i[install rpm package]','(-i)--install'}':filename:_files' \ - \ - '--noborder[no window manager border for main window]' '--noborder' \ - '--fullscreen[use full screen]' '--fullscreen' \ - \ - ':module:->module' && return 0 - -case $state in - module) compadd $_yast2_modules; _files -g "*.ycp";; -esac - - diff --git a/_zypper b/_zypper deleted file mode 100644 index 1fc2e4c..0000000 --- a/_zypper +++ /dev/null @@ -1,73 +0,0 @@ -#compdef zypper -# -# Copyright (C) 2009 Holger Macht -# -# This file is released under the GPLv2. -# -# Based on the the zsh guide from http://zsh.dotsrc.org/Guide/zshguide06.html -# -# Toggle verbose completions: zstyle ':completion:*:zypper:*' verbose no -# zstyle ':completion:*:zypper-subcommand:*' verbose no -# -# version 0.1 -# -# Main dispatcher - -_zypper() { - if (( CURRENT > 2 )) && [[ ${words[2]} != "help" ]]; then - # Remember the subcommand name - local cmd=${words[2]} - # Set the context for the subcommand. - curcontext="${curcontext%:*:*}:zypper-subcommand" - # Narrow the range of words we are looking at to exclude `zypper' - (( CURRENT-- )) - shift words - - _zypper_cmd_do $cmd - else - local hline - local -a cmdlist - local tag=0 - _call_program help-commands zypper help | while read -A hline; do - # start parsing with "Global Options:" - [[ $hline =~ "^Global Options:" ]] && tag=1 - [[ $tag = 0 ]] && continue - [[ $hline[1] =~ ^\t\t\t\t ]] && continue - # all commands have to start with lower case letters - [[ $hline[1] =~ ^[A-Z] ]] && continue - (( ${#hline} < 2 )) && continue - - # cut comma at end of command - hline[1]=`echo $hline[1] | sed -e 's/\(^.*\),/\1/'` - - # ${hline[1]%,} truncates the last ',' - cmdlist=($cmdlist "${hline[1]%,}:${hline[2,-1]}") - done - _describe -t zypper-commands 'zypper command' cmdlist - fi -} - -_zypper_cmd_do() { - local hline - local -a cmdlist - local tag=0 - _call_program help-commands zypper help $cmd | while read -A hline; do - # start parsing from "Options:" - [[ $hline =~ "^Command options:" ]] && tag=1 - [[ $tag = 0 ]] && continue - # Option has to start with a '-' - [[ $hline[1] =~ ^- ]] || continue - (( ${#hline} < 2 )) && continue - - cmdlist=($cmdlist "${hline[1]%,}:${hline[2,-1]}") - done - - if [ -n "$cmdlist" ]; then - _describe -t zypper-commands 'zypper command' cmdlist - else - _complete - fi -} - -# Code to make sure _zypper is run when we load it -_zypper "$@" diff --git a/zsh-4.3.11-dev-2.tar.bz2 b/zsh-4.3.11-dev-2.tar.bz2 deleted file mode 100644 index 8e42bfa..0000000 --- a/zsh-4.3.11-dev-2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fae07ab1a95bf7c51ea4251d416e52dca2b0ab488edb40be5219363d464450d4 -size 2903987 diff --git a/zsh-4.3.11-doc_intro_paths.patch b/zsh-4.3.11-doc_intro_paths.patch deleted file mode 100644 index a2b3aae..0000000 --- a/zsh-4.3.11-doc_intro_paths.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- Doc/intro.ms.orig -+++ Doc/intro.ms -@@ -516,13 +516,13 @@ separate process is not created.) - %\0ed\0/tmp/funs/yp - 25 - i --#!\0/usr/local/bin/zsh -+#!\0/usr/bin/zsh - . - w - 42 - q - %\0>!$ -+%\0/usr/bin/!:0\0!-2*:s/foo/bar/\0>>!$ - .De - If you don't want to use this, you can turn it off - by typing \fCsetopt nobanghist\fP. If you are afraid of accidentally -@@ -1191,9 +1191,9 @@ bar - In this example, no event designator was used, which tells \fBzsh\fP - to use the previous command. A \fC$\fP specifies the last argument - .Ds --%\0mkdir\0/usr/local/lib/emacs/site-lisp/calc -+%\0mkdir\0/usr/share/emacs/site-lisp/calc - %\0cd\0!:$ --cd\0/usr/local/lib/emacs/site-lisp/calc -+cd\0/usr/share/emacs/site-lisp/calc - .De - If you use more words of the same command, only the first \fC!\fP - needs an event designator. ---- Test/E01options.ztst.orig -+++ Test/E01options.ztst -@@ -116,7 +116,7 @@ - >scalar - - # Count the number of directories on the stack. Don't care what they are. -- dircount() { dirs -v | tail -1 | awk '{ print $1 + 1}'; } -+ dircount() { dirs -v | tail -n 1 | awk '{ print $1 + 1}'; } - unsetopt autopushd - cd tmpcd - dircount diff --git a/zsh-4.3.11-doc_makefile.patch b/zsh-4.3.11-doc_makefile.patch deleted file mode 100644 index 3864336..0000000 --- a/zsh-4.3.11-doc_makefile.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- Doc/Makefile.in.orig -+++ Doc/Makefile.in -@@ -40,7 +40,7 @@ INSTALL = @INSTALL@ - MAKEINFO = makeinfo - TEXI2DVI = texi2dvi - DVIPS = dvips --TEXI2HTML = @TEXI2HTML@ --output . --ifinfo --split=chapter --node-files -+TEXI2HTML = @TEXI2HTML@ --output . --split=chapter --node-files - - .SUFFIXES: .yo .1 - -@@ -294,26 +294,9 @@ install.man: man - # install info pages, creating install directory if necessary - install.info: texi - ${SHELL} $(sdir_top)/mkinstalldirs $(DESTDIR)$(infodir) -- rm -rf infodir -- mkdir infodir -- if ( \ -- sed '/^@setfilename/s|zsh|$(tzsh)|' \ -- < $(sdir)/zsh.texi > infodir/tzsh.texi && \ -- (cd infodir && $(MAKEINFO) tzsh.texi) && \ -- for file in infodir/$(tzsh).info*; do \ -- $(INSTALL_DATA) $$file $(DESTDIR)$(infodir) || exit 1; \ -- done \ -- ); then \ -- if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \ -- install-info --info-dir=$(DESTDIR)$(infodir) \ -- $(DESTDIR)$(infodir)/$(tzsh).info; \ -- else true; fi; \ -- rm -rf infodir; \ -- exit 0; \ -- else \ -- rm -rf infodir; \ -- exit 1; \ -- fi -+ for file in zsh.info*; do \ -+ $(INSTALL_DATA) $$file $(DESTDIR)$(infodir) || exit 1; \ -+ done - .PHONY: install.info - - # uninstall man pages -@@ -332,7 +315,7 @@ uninstall.info: - # install HTML manual - install.html: html - ${SHELL} $(sdir_top)/mkinstalldirs $(DESTDIR)$(htmldir) -- for file in *.html; do \ -+ for file in zsh*.html; do \ - $(INSTALL_DATA) $$file $(DESTDIR)$(htmldir) || exit 1; \ - done - .PHONY: install.html diff --git a/zsh-4.3.11-fix-a01grammar.patch b/zsh-4.3.11-fix-a01grammar.patch deleted file mode 100644 index a6fe009..0000000 --- a/zsh-4.3.11-fix-a01grammar.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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-4.3.11-run-help_pager.patch b/zsh-4.3.11-run-help_pager.patch deleted file mode 100644 index c43be24..0000000 --- a/zsh-4.3.11-run-help_pager.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- Functions/Misc/run-help.orig -+++ Functions/Misc/run-help -@@ -29,7 +29,7 @@ then - return 0 - elif [[ -n "${HELPDIR:-}" && -r $HELPDIR/$1 && $1 != compctl ]] - then -- ${=PAGER:-more} $HELPDIR/$1 -+ ${=PAGER:-less -M} $HELPDIR/$1 - return $? - fi - -@@ -65,7 +65,7 @@ do - (comp*) man zshcompsys;; - (zf*) man zshftpsys;; - (run-help) man zshcontrib;; -- (*) builtin functions ${what[(w)1]} | ${=PAGER:-more};; -+ (*) builtin functions ${what[(w)1]} | ${=PAGER:-less -M};; - esac;; - (*( is a * builtin)) - case ${what[(w)1]} in diff --git a/zsh-4.3.11-disable-c02cond-test.patch b/zsh-4.3.12-disable-c02cond-test.patch similarity index 63% rename from zsh-4.3.11-disable-c02cond-test.patch rename to zsh-4.3.12-disable-c02cond-test.patch index d2e9556..b8561c2 100644 --- a/zsh-4.3.11-disable-c02cond-test.patch +++ b/zsh-4.3.12-disable-c02cond-test.patch @@ -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 diff --git a/zsh-4.3.12.tar.bz2 b/zsh-4.3.12.tar.bz2 new file mode 100644 index 0000000..758b1d7 --- /dev/null +++ b/zsh-4.3.12.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4a9fd2dac76fc08fd1dc400deba854fcefa12ad76226d93fb6c01a801324f106 +size 2917959 diff --git a/zsh-cleanup.patch b/zsh-cleanup.patch deleted file mode 100644 index 972f42e..0000000 --- a/zsh-cleanup.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- Src/Makefile.in.orig -+++ Src/Makefile.in -@@ -149,14 +149,7 @@ uninstall.bin: uninstall.bin-here - # install binary, creating install directory if necessary - install.bin-here: zsh$(EXEEXT) $(INSTLIB) - ${SHELL} $(sdir_top)/mkinstalldirs $(DESTDIR)$(bindir) -- $(INSTALL_PROGRAM) $(STRIPFLAGS) zsh$(EXEEXT) $(DESTDIR)$(bindir)/$(tzsh)-$(VERSION)$(EXEEXT) -- if test -f $(DESTDIR)$(bindir)/$(tzsh)$(EXEEXT); then \ -- rm -f $(DESTDIR)$(bindir)/$(tzsh).old; \ -- $(LN) $(DESTDIR)$(bindir)/$(tzsh)$(EXEEXT) $(DESTDIR)$(bindir)/$(tzsh).old; \ -- else :; fi -- rm -f $(DESTDIR)$(bindir)/$(tzsh).new -- $(LN) $(DESTDIR)$(bindir)/$(tzsh)-$(VERSION)$(EXEEXT) $(DESTDIR)$(bindir)/$(tzsh).new -- mv $(DESTDIR)$(bindir)/$(tzsh).new $(DESTDIR)$(bindir)/$(tzsh)$(EXEEXT) -+ $(INSTALL_PROGRAM) $(STRIPFLAGS) zsh $(DESTDIR)$(bindir)/zsh - .PHONY: install.bin-here - - install.bin-N: ---- Src/Modules/terminfo.c.orig -+++ Src/Modules/terminfo.c -@@ -28,6 +28,7 @@ - */ - - #define USES_TERM_H 1 -+#include - #include "terminfo.mdh" - - #if defined(HAVE_TIGETFLAG) && defined(ZSH_HAVE_CURSES_H) diff --git a/zsh.changes b/zsh.changes index cb3e94d..31a9643 100644 --- a/zsh.changes +++ b/zsh.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jun 1 13:17:38 UTC 2011 - idonmez@novell.com + +- Update to zsh 4.3.12 + ------------------------------------------------------------------- Tue Apr 26 15:43:10 UTC 2011 - idoenmez@novell.com diff --git a/zsh.spec b/zsh.spec index 8a19b22..5dbe55a 100644 --- a/zsh.spec +++ b/zsh.spec @@ -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 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 +Source3: zprofile +Patch1: %{name}-%{version}-disable-c02cond-test.patch BuildRequires: fdupes BuildRequires: libcap-devel BuildRequires: ncurses-devel @@ -57,22 +45,14 @@ at home, and extra features drawn from tcsh (another `custom' shell). 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 @@ perl -p -i -e 's|/usr/princeton|%{_bindir}|' \ --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 @@ troff -Tlatin1 -t -mandoc ../Doc/zshbuiltins.1 | \ 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 @@ rm -rf %{buildroot} %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