Author: arekm Date: Thu Feb 24 19:24:06 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- rel 2; export var in zsh only if var is set
---- Files affected:
packages/setup:
setup.spec (1.159 -> 1.160) , setup-zsh.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/setup/setup.spec
diff -u packages/setup/setup.spec:1.159 packages/setup/setup.spec:1.160
--- packages/setup/setup.spec:1.159 Tue Jan 25 13:08:35 2011
+++ packages/setup/setup.spec Thu Feb 24 20:24:01 2011
@@ -15,7 +15,7 @@
Summary(tr.UTF-8): Basit kurulum dosyaları
Name: setup
Version: 2.7.3
-Release: 1
+Release: 2
License: Public Domain, partially BSD-like
Group: Base
Source0: %{name}-%{version}.tar.bz2
@@ -31,6 +31,7 @@
# This is source of non-iana changes in services file
Patch1: %{name}-services.patch
Patch2: protocols-fmt.patch
+Patch3: %{name}-zsh.patch
BuildRequires: dietlibc-static
BuildRequires: gawk
Requires: FHS >= 2.3-24.1
@@ -84,6 +85,7 @@
%patch0 -p1
mv iana-etc{-%{iana_etc_ver},}
%patch2 -p1
+%patch3 -p1
cp -a %{SOURCE2} iana-etc/protocol-numbers.iana
cp -a %{SOURCE3} iana-etc/port-numbers.iana
@@ -160,6 +162,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.160 2011/02/24 19:24:01 arekm
+- rel 2; export var in zsh only if var is set
+
Revision 1.159 2011/01/25 12:08:35 glen
- 2.7.3:
- etc/profile: - add xdg like ~/.local/bin to PATH if exists
================================================================
Index: packages/setup/setup-zsh.patch
diff -u /dev/null packages/setup/setup-zsh.patch:1.1
--- /dev/null Thu Feb 24 20:24:07 2011
+++ packages/setup/setup-zsh.patch Thu Feb 24 20:24:01 2011
@@ -0,0 +1,28 @@
+Index: profile
+===================================================================
+RCS file: /cvsroot/setup/etc/profile,v
+retrieving revision 1.55
+retrieving revision 1.56
+diff -u -u -r1.55 -r1.56
+--- setup/etc/profile 22 Jan 2011 20:08:54 -0000 1.55
++++ setup/etc/profile 24 Feb 2011 19:17:44 -0000 1.56
+@@ -128,7 +128,18 @@
+ ;;
+ * )
+ if [ -r "$i" ]; then
+- . "$i"; export "$NAME"
++ . "$i"
++ # export VAR will set and export VAR
++ # if it didn't exist before. Other
shells
++ # (ksh, bash) behave differently.
++ if [ -n "$ZSH_VERSION" ]; then
++ # zsh specific
++ if [ "${(P)+NAME}" = "1" ]; then
++ export "$NAME"
++ fi
++ else
++ export "$NAME"
++ fi
+ fi
+ ;;
+ esac
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/setup/setup.spec?r1=1.159&r2=1.160&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
