rpms/tcsh/devel .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 tcsh.spec, 1.60, 1.61 tcsh-6.14.00-config.patch, 1.1, NONE tcsh-6.14.00-octal.patch, 1.1, NONE tcsh-6.14.00-read.patch, 1.1, NONE tcsh-6.14.00-remotehost.patch, 1.1, NONE tcsh-6.14.00-sigint.patch, 1.1, NONE tcsh-6.14.00-spell-crash.patch, 1.1, NONE tcsh-6.15.00-var-sub.patch, 1.2, NONE

Tue Apr 28 15:50:46 UTC 2009

Author: vcrhonek

Update of /cvs/extras/rpms/tcsh/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9419

Modified Files:
	.cvsignore sources tcsh.spec 
Removed Files:
	tcsh-6.14.00-config.patch tcsh-6.14.00-octal.patch 
	tcsh-6.14.00-read.patch tcsh-6.14.00-remotehost.patch 
	tcsh-6.14.00-sigint.patch tcsh-6.14.00-spell-crash.patch 
	tcsh-6.15.00-var-sub.patch 
Log Message:
Update to tcsh-6.16.00, Merge Review


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tcsh/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8

--- .cvsignore	27 Aug 2007 15:01:35 -0000	1.7
+++ .cvsignore	28 Apr 2009 15:50:16 -0000	1.8
@@ -1,2 +1,3 @@
 tcsh-6.14.00.tar.gz
 tcsh-6.15.00.tar.gz
+tcsh-6.16.00.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tcsh/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	27 Aug 2007 15:01:35 -0000	1.7
+++ sources	28 Apr 2009 15:50:16 -0000	1.8
@@ -1 +1 @@
-67a0611620b080bd0eb032b1774382b6  tcsh-6.15.00.tar.gz
+55f1a41512250168ec4bf1db0e246db4  tcsh-6.16.00.tar.gz


Index: tcsh.spec
===================================================================
RCS file: /cvs/extras/rpms/tcsh/devel/tcsh.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- tcsh.spec	2 Mar 2009 14:11:52 -0000	1.60
+++ tcsh.spec	28 Apr 2009 15:50:16 -0000	1.61
@@ -2,21 +2,19 @@
 
 Summary: An enhanced version of csh, the C shell
 Name: tcsh
-Version: 6.15
-Release: 8%{?dist}
-License: BSD with advertising
+Version: 6.16
+Release: 1%{?dist}
+License: BSD
 Group: System Environment/Shells
-Source: ftp://ftp.astron.com/pub/tcsh/tcsh-%{version}.00.tar.gz
+Source: ftp://ftp.astron.com/pub/tcsh/%{name}-%{version}.00.tar.gz
 Patch1: tcsh-6.15.00-closem.patch
 Patch2: tcsh-6.14.00-tinfo.patch
 Patch3: tcsh-6.14.00-unprintable.patch
 Patch4: tcsh-6.15.00-hist-sub.patch
-Patch5: tcsh-6.15.00-var-sub.patch
 Patch6: tcsh-6.15.00-ca-color.patch
 Patch7: tcsh-6.14.00-set.patch
 Patch8: tcsh-6.14.00-syntax.patch
 Patch9: tcsh-6.13.00-memoryuse.patch
-Patch10: tcsh-6.14.00-octal.patch
 Patch11: tcsh-6.14.00-order.patch
 Patch12: tcsh-6.15.00-wide-str.patch
 Patch13: tcsh-6.15.00-rs-color.patch
@@ -41,28 +39,31 @@ like syntax.
 %patch2 -p1 -b .tinfo
 %patch3 -p1 -b .unprintable
 %patch4 -p1 -b .hist-sub
-%patch5 -p1 -b .var-sub
 %patch6 -p1 -b .ca-color
 %patch7 -p1 -b .set
 %patch8 -p1 -b .syntax
 %patch9 -p1 -b .memoryuse
-%patch10 -p1 -b .octal
 %patch11 -p1 -b .order
 %patch12 -p1 -b .wide-str
 %patch13 -p1 -b .rs-color
 
+for i in Fixes WishList; do
+    iconv -f iso-8859-1 -t utf-8 < "$i" > "${i}_"
+    mv "${i}_" "$i"
+done
+
 %build
 # For tcsh-6.14.00-tinfo.patch
 autoreconf
 %configure --without-hesiod
-make all
-make -C nls catalogs
+make %{?_smp_mflags} all
+make %{?_smp_mflags} -C nls catalogs
 
 %install
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf ${RPM_BUILD_ROOT}
+rm -rf $RPM_BUILD_ROOT
 mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man1 ${RPM_BUILD_ROOT}%{_bindir}
-install -m 755 tcsh ${RPM_BUILD_ROOT}%{_bindir}/tcsh
-install -m 644 tcsh.man ${RPM_BUILD_ROOT}%{_mandir}/man1/tcsh.1
+install -p -m 755 tcsh ${RPM_BUILD_ROOT}%{_bindir}/tcsh
+install -p -m 644 tcsh.man ${RPM_BUILD_ROOT}%{_mandir}/man1/tcsh.1
 ln -sf tcsh ${RPM_BUILD_ROOT}%{_bindir}/csh
 ln -sf tcsh.1 ${RPM_BUILD_ROOT}%{_mandir}/man1/csh.1
 
@@ -70,7 +71,7 @@ while read lang language ; do
 	dest=${RPM_BUILD_ROOT}%{_datadir}/locale/$lang/LC_MESSAGES
 	if test -f tcsh.$language.cat ; then
 		mkdir -p $dest
-		install -m644 tcsh.$language.cat $dest/tcsh
+		install -p -m 644 tcsh.$language.cat $dest/tcsh
 		echo "%lang($lang) %{_datadir}/locale/$lang/LC_MESSAGES/tcsh"
 	fi
 done > tcsh.lang << _EOF
@@ -89,34 +90,41 @@ uk ukrainian
 _EOF
 
 %clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf ${RPM_BUILD_ROOT}
+rm -rf $RPM_BUILD_ROOT
 
 %post
 if [ ! -f /etc/shells ]; then
-	echo "%{_bindir}/tcsh" >> /etc/shells
-	echo "%{_bindir}/csh"  >> /etc/shells
+ echo "%{_bindir}/tcsh" >> /etc/shells
+ echo "%{_bindir}/csh"  >> /etc/shells
 else
-	grep -q '^%{_bindir}/tcsh$' /etc/shells || \
-	echo "%{_bindir}/tcsh" >> /etc/shells
-	grep -q '^%{_bindir}/csh$'  /etc/shells || \
-	echo "%{_bindir}/csh"  >> /etc/shells
+ grep -q '^%{_bindir}/tcsh$' /etc/shells || \
+ echo "%{_bindir}/tcsh" >> /etc/shells
+ grep -q '^%{_bindir}/csh$'  /etc/shells || \
+ echo "%{_bindir}/csh"  >> /etc/shells
 fi
 
 %postun
 if [ ! -x %{_bindir}/tcsh ]; then
-	grep -v '^%{_bindir}/tcsh$'  /etc/shells | \
-	grep -v '^%{_bindir}/csh$' > /etc/shells.rpm
-	cat /etc/shells.rpm > /etc/shells && rm /etc/shells.rpm
+ grep -v '^%{_bindir}/tcsh$'  /etc/shells | \
+ grep -v '^%{_bindir}/csh$' > /etc/shells.rpm && \
+ mv /etc/shells.rpm /etc/shells
 fi
 
 %files -f tcsh.lang
 %defattr(-,root,root)
-%doc FAQ Fixes NewThings complete.tcsh
+%doc BUGS FAQ Fixes NewThings WishList complete.tcsh
 %{_bindir}/tcsh
 %{_bindir}/csh
-%{_mandir}/*/*
+%{_mandir}/man1/*.1*
 
 %changelog
+* Tue Apr 28 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 6.16-1
+- Update to tcsh-6.16.00
+- Merge Review (fix License, add BUGS and WishList to documentation, convert Fixes and
+  WishList to UTF-8, remove root checking from buildroot cleaning, preserve timestamps,
+  use smp_flags, remove unused patches and improve postun script)
+  Resolves: #226483
+
 * Mon Mar  2 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 6.15-8
 - Fix tcsh needs to know about new colorls variables
   Resolves: #487783


--- tcsh-6.14.00-config.patch DELETED ---


--- tcsh-6.14.00-octal.patch DELETED ---


--- tcsh-6.14.00-read.patch DELETED ---


--- tcsh-6.14.00-remotehost.patch DELETED ---


--- tcsh-6.14.00-sigint.patch DELETED ---


--- tcsh-6.14.00-spell-crash.patch DELETED ---


--- tcsh-6.15.00-var-sub.patch DELETED ---


