- rel 2; fix LINES/COLUMNS test when bash is sourcing this file

Changed files:
    rc-scripts-lc.patch -> 1.4
    rc-scripts.spec -> 1.321

diff --git a/rc-scripts-lc.patch b/rc-scripts-lc.patch
new file mode 100644 (file)
index 0000000..b0ac48c
--- /dev/null
+++ b/rc-scripts-lc.patch
@@ -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))
+ 

diff --git a/rc-scripts.spec b/rc-scripts.spec
index 761ca1d36241b9e879344a86c15333e983de0aab..7e8fe51475d0902106ad5500c1f74597e78df4ef 100644 (file)
--- a/rc-scripts.spec
+++ b/rc-scripts.spec
@@ -9,12 +9,13 @@ Summary(pl.UTF-8):    inittab i skrypty startowe z katalogu /etc/rc.d
 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
@@ -104,6 +105,7 @@ programcıklar içerir.
 %prep
 %setup -q
 %patch0 -p0
+%patch1 -p0
 
 %build
 %{__aclocal}