diff --git a/tcsh.spec b/tcsh.spec
index 703ab24..196ad19 100644
--- a/tcsh.spec
+++ b/tcsh.spec
@@ -1,22 +1,25 @@
 %define	_bindir	/bin
 
 Summary: An enhanced version of csh, the C shell.
-Name: tcsh
-Version: 6.10
-Release: 1
-Copyright: distributable
-Group: System Environment/Shells
-Source: ftp://ftp.astron.com/pub/tcsh/tcsh-%{version}.tar.gz
-Patch0: tcsh-6.10.00-utmp.patch
-Patch1: tcsh-6.09.00-termios.patch
-Patch2: tcsh-6.08.00-security.patch
-Patch3: tcsh-6.08.00-pathmax.patch
-Patch4: tcsh-6.09.00-strcoll.patch
-Patch5: tcsh-6.09.00-locale.patch
-Provides: csh = %{version}
-Prereq: fileutils, grep
-URL: http://www.primate.wisc.edu/software/csh-tcsh-book/
-Buildroot: %{_tmppath}/%{name}-root
+Name:		tcsh
+Version:	6.10
+Release:	5
+Copyright:	distributable
+Group:		System Environment/Shells
+Source:		ftp://ftp.astron.com/pub/tcsh/tcsh-%{version}.tar.gz
+Patch0:		tcsh-6.10.00-utmp.patch
+Patch1:		tcsh-6.09.00-termios.patch
+Patch2:		tcsh-6.08.00-security.patch
+Patch3:		tcsh-6.08.00-pathmax.patch
+Patch4:		tcsh-6.09.00-strcoll.patch
+Patch5:		tcsh-6.09.00-locale.patch
+Patch6:		tcsh-6.10.00-glibc_compat.patch
+Patch7:		tcsh-6.10.00-login.patch
+Patch8:		tcsh-6.10.00-dspmbyte.patch
+Provides:	csh = %{version}
+Prereq:		fileutils, grep
+URL:		http://www.primate.wisc.edu/software/csh-tcsh-book/
+Buildroot:	%{_tmppath}/%{name}-%{version}-root
 
 %description
 Tcsh is an enhanced but completely compatible version of csh, the C
@@ -37,6 +40,9 @@ like syntax.
 # upstreamed in 6.10.00
 #%patch4 -p1 -b .strcoll
 %patch5 -p1 -b .locale
+%patch6 -p1 -b .glibc_compat
+%patch7 -p1 -b .login
+%patch8 -p1 -b .mbyte
 
 %build
 
@@ -45,26 +51,26 @@ make LIBES="-lnsl -ltermcap -lcrypt" all catalogs
 %{__perl} tcsh.man2html
 
 %install
-rm -rf ${RPM_BUILD_ROOT}
+[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf ${RPM_BUILD_ROOT}
 mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man1 ${RPM_BUILD_ROOT}%{_bindir}
 install -m 755 -s tcsh ${RPM_BUILD_ROOT}%{_bindir}/tcsh
 install -m 644 tcsh.man ${RPM_BUILD_ROOT}%{_mandir}/man1/tcsh.1
 ln -sf tcsh ${RPM_BUILD_ROOT}%{_bindir}/csh
 nroff -me eight-bit.me > eight-bit.txt
 
-for i in de es fr gr_GR it ja
+for i in de el es fr it ja
 do
     mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/locale/$i/LC_MESSAGES
 done
 install -m 644 tcsh.german.cat ${RPM_BUILD_ROOT}%{_datadir}/locale/de/LC_MESSAGES/tcsh
 install -m 644 tcsh.spanish.cat ${RPM_BUILD_ROOT}%{_datadir}/locale/es/LC_MESSAGES/tcsh
 install -m 644 tcsh.french.cat ${RPM_BUILD_ROOT}%{_datadir}/locale/fr/LC_MESSAGES/tcsh
-install -m 644 tcsh.greek.cat ${RPM_BUILD_ROOT}%{_datadir}/locale/gr_GR/LC_MESSAGES/tcsh
+install -m 644 tcsh.greek.cat ${RPM_BUILD_ROOT}%{_datadir}/locale/el/LC_MESSAGES/tcsh
 install -m 644 tcsh.italian.cat ${RPM_BUILD_ROOT}%{_datadir}/locale/it/LC_MESSAGES/tcsh
 install -m 644 tcsh.ja.cat ${RPM_BUILD_ROOT}%{_datadir}/locale/ja/LC_MESSAGES/tcsh
 
 %clean
-rm -rf ${RPM_BUILD_ROOT}
+[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf ${RPM_BUILD_ROOT}
 
 %post
 if [ ! -f /etc/shells ]; then
@@ -87,9 +93,21 @@ fi
 %{_bindir}/tcsh
 %{_bindir}/csh
 %{_mandir}/*/*
-%{_datadir}/locale/*/LC_MESSAGES/tcsh*
+%lang(de)	%{_datadir}/locale/de/LC_MESSAGES/tcsh*
+%lang(el)	%{_datadir}/locale/el/LC_MESSAGES/tcsh*
+%lang(es)	%{_datadir}/locale/es/LC_MESSAGES/tcsh*
+%lang(fr)	%{_datadir}/locale/fr/LC_MESSAGES/tcsh*
+%lang(it)	%{_datadir}/locale/it/LC_MESSAGES/tcsh*
+%lang(ja)	%{_datadir}/locale/ja/LC_MESSAGES/tcsh*
 
 %changelog
+* Wed Mar 28 2001 Akira TAGOH <tagoh@redhat.com> 6.10-5
+- Fixed check locale.
+
+* Tue Feb  6 2001 Adrian Havill <havill@redhat.com>
+- use <time.h> instead of <sys/time.h> for pickier lib (#25935)
+- allow arguments for login shells (#19926)
+
 * Thu Nov 30 2000 Nalin Dahyabhai <nalin@redhat.com>
 - update to 6.10.00 to fix here-script vulnerability