packages: rc-scripts/rc-scripts.spec, rc-scripts/rc-scripts-lc.patch - rel ...

[arekm]

Author: arekm                        Date: Fri Jan 15 13:59:09 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 2; fix LINES/COLUMNS test when bash is sourcing this file

---- Files affected:
packages/rc-scripts:
   rc-scripts.spec (1.320 -> 1.321) , rc-scripts-lc.patch (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: packages/rc-scripts/rc-scripts.spec
diff -u packages/rc-scripts/rc-scripts.spec:1.320 packages/rc-scripts/rc-scripts.spec:1.321
--- packages/rc-scripts/rc-scripts.spec:1.320	Sun Jan 10 23:09:43 2010
+++ packages/rc-scripts/rc-scripts.spec	Fri Jan 15 14:59:04 2010
@@ -10,12 +10,13 @@
 Summary(tr.UTF-8):	inittab ve /etc/rc.d dosyaları
 Name:		rc-scripts
 Version:	0.4.2.7
-Release:	1
+Release:	2
 License:	GPL v2
 Group:		Base
 Source0:	ftp://distfiles.pld-linux.org/src/%{name}-%{version}.tar.gz
 # Source0-md5:	e63df4abb56f1498d39745596d33470f
 Patch0:		dropcaps.patch
+Patch1:		%{name}-lc.patch
 URL:		http://svn.pld-linux.org/cgi-bin/viewsvn/rc-scripts/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -105,6 +106,7 @@
 %prep
 %setup -q
 %patch0 -p0
+%patch1 -p0
 
 %build
 %{__aclocal}
@@ -344,6 +346,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.321  2010/01/15 13:59:04  arekm
+- rel 2; fix LINES/COLUMNS test when bash is sourcing this file
+
 Revision 1.320  2010/01/10 22:09:43  arekm
 - up to 0.4.2.7.
 

================================================================
Index: packages/rc-scripts/rc-scripts-lc.patch
diff -u /dev/null packages/rc-scripts/rc-scripts-lc.patch:1.4
--- /dev/null	Fri Jan 15 14:59:09 2010
+++ packages/rc-scripts/rc-scripts-lc.patch	Fri Jan 15 14:59:04 2010
@@ -0,0 +1,15 @@
+Index: rc.d/init.d/functions
+===================================================================
+--- rc.d/init.d/functions	(wersja 11112)
++++ rc.d/init.d/functions	(kopia robocza)
+@@ -25,8 +25,8 @@
+ 	_setterm
+ 	unset _setterm
+ fi
+-[ -z "$LINES" -o "$LINES" -le 0 ] && LINES=40
+-[ -z "$COLUMNS" -o "$COLUMNS" -le 0 ] && COLUMNS=80
++[ -z "$LINES" ] || [ "$LINES" -le 0 ] && LINES=40
++[ -z "$COLUMNS" ] || [ "$COLUMNS" -le 0 ] && COLUMNS=80
+ export LINES COLUMNS
+ INIT_COL=$((COLUMNS - 13))
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rc-scripts/rc-scripts.spec?r1=1.320&r2=1.321&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rc-scripts/rc-scripts-lc.patch?r1=1.3&r2=1.4&f=u