rpms/zsh/devel zsh-4.3.6-8bit-prompts.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 sources, 1.12, 1.13 zsh.spec, 1.42, 1.43 zsh-4.3.4-8bit-prompts.patch, 1.1, NONE
James Antill
james at fedoraproject.org
Mon Aug 25 20:34:27 UTC 2008
Author: james
Update of /cvs/pkgs/rpms/zsh/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20771
Modified Files:
.cvsignore sources zsh.spec
Added Files:
zsh-4.3.6-8bit-prompts.patch
Removed Files:
zsh-4.3.4-8bit-prompts.patch
Log Message:
* Mon Aug 25 2008 James Antill <james at fedoraproject.org> - 4.3.6-1
- Import new upstream 4.3.6
- Rebase 8bit prompt patch.
zsh-4.3.6-8bit-prompts.patch:
--- NEW FILE zsh-4.3.6-8bit-prompts.patch ---
diff -ru zsh-4.3.6-orig/Functions/Prompts/prompt_bigfade_setup zsh-4.3.6/Functions/Prompts/prompt_bigfade_setup
--- zsh-4.3.6-orig/Functions/Prompts/prompt_bigfade_setup 2007-06-14 12:11:39.000000000 -0400
+++ zsh-4.3.6/Functions/Prompts/prompt_bigfade_setup 2008-08-25 16:27:30.000000000 -0400
@@ -7,7 +7,7 @@
cat <<EOH
This prompt is color-scheme-able. You can invoke it thus:
- prompt bigfade [<fade-bar> [<userhost> [<date> [<cwd>]]]]
+ prompt bigfade [8bit] [<fade-bar> [<userhost> [<date> [<cwd>]]]]
where the parameters are the colors for the fade-bar, user at host text,
date text, and current working directory respectively. The default
@@ -27,9 +27,12 @@
local date=${3:-'white'}
local cwd=${4:-'yellow'}
+ if [[ $1 == '8bit' ]]; then
+ shift
local char_333 char_262 char_261 char_260
autoload -U prompt_special_chars
prompt_special_chars
+ fi
PS1="%{$bold_color$fg[$fadebar]$bold_color%}$char_333$char_262$char_261$char_260%{$bold_color$fg[$userhost]$bg[$fadebar]%}%n@%m%{$reset_color$fg[$fadebar]$bg[grey]%}$char_260$char_261$char_262$char_333%{$reset_color$fg[$fadebar]$bg[grey]%}$char_333$char_262$char_261$char_260%{$bold_color$fg[$date]$bg[grey]%} %D{%a %b %d} %D{%I:%M:%S%P}$prompt_newline%{$bold_color$fg[$cwd]$bg[grey]%}$PWD>%{$reset_color%} "
PS2="%{$bold_color$fg[$fadebar]$bold_color%}$char_333$char_262$char_261$char_260%{$reset_color$fg[$fadebar]$bg[grey]%}$char_260$char_261$char_262$char_333%{$reset_color$fg[$fadebar]$bg[grey]%}$char_333$char_262$char_261$char_260%{$bold_color$bold_color$fg[$fadebar]%}>%{$reset_color%} "
diff -ru zsh-4.3.6-orig/Functions/Prompts/prompt_elite2_setup zsh-4.3.6/Functions/Prompts/prompt_elite2_setup
--- zsh-4.3.6-orig/Functions/Prompts/prompt_elite2_setup 2007-06-14 12:11:39.000000000 -0400
+++ zsh-4.3.6/Functions/Prompts/prompt_elite2_setup 2008-08-25 16:26:03.000000000 -0400
@@ -6,7 +6,7 @@
cat <<EOH
This prompt is color-scheme-able. You can invoke it thus:
- prompt elite2 [<text-color> [<parentheses-color>]]
+ prompt elite2 [8bit] [<text-color> [<parentheses-color>]]
The default colors are both cyan. This theme works best with a dark
background.
@@ -21,9 +21,12 @@
local text_col=${1:-'cyan'}
local parens_col=${2:-$text_col}
+ if [[ $1 == '8bit' ]]; then
+ shift
local char_333 char_262 char_261 char_260
autoload -U prompt_special_chars
prompt_special_chars
+ fi
local text="%{$fg_no_bold[$text_col]%}"
local parens="%{$fg_bold[$parens_col]%}"
diff -ru zsh-4.3.6-orig/Functions/Prompts/prompt_elite_setup zsh-4.3.6/Functions/Prompts/prompt_elite_setup
--- zsh-4.3.6-orig/Functions/Prompts/prompt_elite_setup 2007-06-14 12:11:39.000000000 -0400
+++ zsh-4.3.6/Functions/Prompts/prompt_elite_setup 2008-08-25 16:26:21.000000000 -0400
@@ -6,7 +6,7 @@
cat <<EOH
This prompt is color-scheme-able. You can invoke it thus:
- prompt elite [<text-color> [<punctuation-color>]]
+ prompt elite [8bit] [<text-color> [<punctuation-color>]]
The default colors are red and blue respectively. This theme is
intended for use with a black background.
@@ -21,9 +21,12 @@
local text=${1:-'red'}
local punctuation=${2:-'blue'}
+ if [[ $1 == '8bit' ]]; then
+ shift
local char_333 char_262 char_261 char_260
autoload -U prompt_special_chars
prompt_special_chars
+ fi
PS1="%{$fg[$text]%}$char_332$char_304%{$fg[$punctuation]%}(%{$fg[$text]%}%n%{$fg[$punctuation]%}@%{$fg[$text]%}%m%{$fg[$punctuation]%})%{$fg[$text]%}-%{$fg[$punctuation]%}(%{$fg[$text]%}%D{%I:%M%P}%{$fg[$punctuation]%}-:-%{$fg[$text]%}%D{%m}%{$fg[$punctuation]$fg[$text]%}/%D{%d}%{$fg[$punctuation]%})%{$fg[$text]%}$char_304-%{$fg[$punctuation]]%}$char_371%{$fg[$text]%}-$char_371$char_371%{$fg[$punctuation]%}$char_372$prompt_newline%{$fg[$text]%}$char_300$char_304%{$fg[$punctuation]%}(%{$fg[$text]%}%1~%{$fg[$punctuation]%})%{$fg[$text]%}$char_304$char_371%{$fg[$punctuation]%}$char_372%{$reset_color%}"
PS2="> "
diff -ru zsh-4.3.6-orig/Functions/Prompts/prompt_fade_setup zsh-4.3.6/Functions/Prompts/prompt_fade_setup
--- zsh-4.3.6-orig/Functions/Prompts/prompt_fade_setup 2007-06-14 12:11:39.000000000 -0400
+++ zsh-4.3.6/Functions/Prompts/prompt_fade_setup 2008-08-25 16:26:51.000000000 -0400
@@ -7,7 +7,7 @@
cat <<EOH
This prompt is color-scheme-able. You can invoke it thus:
- prompt fade [<fade-bar-and-cwd> [<userhost> [<date>]]]
+ prompt fade [8bit] [<fade-bar-and-cwd> [<userhost> [<date>]]]
where the parameters are the colors for the fade-bar and current
working directory, user at host text, and date text respectively. The
@@ -27,9 +27,12 @@
local userhost=${2:-'white'}
local date=${3:-'white'}
+ if [[ $1 == '8bit' ]]; then
+ shift
local char_333 char_262 char_261 char_260
autoload -U prompt_special_chars
prompt_special_chars
+ fi
PS1="%{$fg[$fadebar_cwd]$bg[$fadebar_cwd]$bold_color%}$char_333$char_262$char_261$char_260%{$fg[$userhost]$bg[$fadebar_cwd]$bold_color%}%n@%m%{$reset_color$fg[$fadebar_cwd]$bg[grey]%}$char_333$char_262$char_261$char_260%{$fg[$date]$bg[grey]$bold_color%} %D{%a %b %d} %D{%I:%M:%S%P} $prompt_newline%{$fg[$fadebar_cwd]$bg[grey]$bold_color%}%~/%{$reset_color%} "
PS2="%{$fg[$fadebar_cwd]$bg[grey]%}$char_333$char_262$char_261$char_260%{$reset_color%}>"
diff -ru zsh-4.3.6-orig/Functions/Prompts/prompt_fire_setup zsh-4.3.6/Functions/Prompts/prompt_fire_setup
--- zsh-4.3.6-orig/Functions/Prompts/prompt_fire_setup 2007-06-14 12:11:39.000000000 -0400
+++ zsh-4.3.6/Functions/Prompts/prompt_fire_setup 2008-08-25 16:27:09.000000000 -0400
@@ -8,7 +8,7 @@
cat <<EOH
This prompt is color-scheme-able. You can invoke it thus:
- prompt fire [<fire1> [<fire2> [<fire3> [<userhost> [<date> [<cwd>]]]]]]
+ prompt fire [8bit] [<fire1> [<fire2> [<fire3> [<userhost> [<date> [<cwd>]]]]]]
where the parameters are the three fire colors, and the colors for the
user at host text, date text, and current working directory respectively.
@@ -29,9 +29,12 @@
local date=${5:-'white'}
local cwd=${6:-'yellow'}
+ if [[ $1 == '8bit' ]]; then
+ shift
local char_333 char_262 char_261 char_260
autoload -U prompt_special_chars
prompt_special_chars
+ fi
local GRAD1="%{$char_333$char_262$char_261$char_260%}"
local GRAD2="%{$char_260$char_261$char_262$char_333%}"
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zsh/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore 25 Jul 2007 14:57:18 -0000 1.12
+++ .cvsignore 25 Aug 2008 20:33:56 -0000 1.13
@@ -1 +1 @@
-zsh-4.3.4.tar.gz
+zsh-4.3.6.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zsh/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources 25 Jul 2007 14:40:05 -0000 1.12
+++ sources 25 Aug 2008 20:33:56 -0000 1.13
@@ -1 +1 @@
-acc4fc85d18d7f914bb6705775c45bf2 zsh-4.3.4.tar.gz
+16f399af1081ad3c303a794c9c7dc47e zsh-4.3.6.tar.bz2
Index: zsh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zsh/devel/zsh.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- zsh.spec 31 Jan 2008 14:41:15 -0000 1.42
+++ zsh.spec 25 Aug 2008 20:33:57 -0000 1.43
@@ -2,12 +2,12 @@
Summary: A powerful interactive shell
Name: zsh
-Version: 4.3.4
-Release: 7%{?dist}
+Version: 4.3.6
+Release: 1%{?dist}
License: BSD
URL: http://zsh.sunsite.dk/
Group: System Environment/Shells
-Source0: ftp://ftp.zsh.org/pub/zsh-%{version}.tar.gz
+Source0: ftp://ftp.zsh.org/pub/zsh-%{version}.tar.bz2
Source1: zlogin.rhs
Source2: zlogout.rhs
Source3: zprofile.rhs
@@ -18,7 +18,7 @@
Patch0: zsh-serial.patch
#Patch1: zsh-4.0.6-make-test-fail.patch
#Patch3: zsh-4.0.7-bckgrnd-bld-102042.patch
-Patch4: zsh-4.3.4-8bit-prompts.patch
+Patch4: zsh-4.3.6-8bit-prompts.patch
Prereq: fileutils grep /sbin/install-info
Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: mktemp coreutils sed ncurses-devel libcap-devel texinfo tetex texi2html gawk
@@ -152,6 +152,10 @@
%doc Doc/*.html
%changelog
+* Mon Aug 25 2008 James Antill <james at fedoraproject.org> - 4.3.6-1
+- Import new upstream 4.3.6
+- Rebase 8bit prompt patch.
+
* Thu Jan 31 2008 James Antill <james at fedoraproject.org> - 4.3.4-7
- Tweak /etc/zshrc to source /etc/profile.d/*.sh in ksh compat. mode
- Tweak /etc/zprofile to source /etc/profile in ksh compat. mode
--- zsh-4.3.4-8bit-prompts.patch DELETED ---
More information about the scm-commits
mailing list