Author: baggins Date: Thu May 10 06:06:54 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- updated to 6.18.01
- removed obsolete patches
- static tcsh cannot be built anymore due to deps between static libcrypt and
shared nss-softonk-freebl
- install via make install
- updated files
---- Files affected:
packages/tcsh:
tcsh-misc.patch (1.4 -> 1.5) , tcsh-no_TERMCAP.patch (1.2 -> 1.3) ,
tcsh-termios.patch (1.1 -> 1.2) , tcsh.spec (1.90 -> 1.91) ,
tcsh-nls-codesets.patch (1.2 -> NONE) (REMOVED), tcsh-sysmalloc.patch (1.2 ->
NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/tcsh/tcsh-misc.patch
diff -u packages/tcsh/tcsh-misc.patch:1.4 packages/tcsh/tcsh-misc.patch:1.5
--- packages/tcsh/tcsh-misc.patch:1.4 Thu Apr 9 11:45:47 2009
+++ packages/tcsh/tcsh-misc.patch Thu May 10 08:06:49 2012
@@ -1,14 +1,3 @@
---- tcsh-6.13.00/nls/Makefile.orig 2004-02-21 21:34:26.000000000 +0100
-+++ tcsh-6.13.00/nls/Makefile 2004-09-05 10:54:43.930185944 +0200
-@@ -3,7 +3,7 @@
- spanish ukrainian
- #GENCAT= gencat --new
- CHARSET= charset
--GENCAT= gencat
-+GENCAT= gencat --new
-
- catalogs:
- @for i in ${SUBDIRS} ; \
--- tcsh-6.13.00/Makefile.in.orig 2003-03-12 20:14:50.000000000 +0100
+++ tcsh-6.13.00/Makefile.in 2004-09-05 10:55:21.588461016 +0200
@@ -136,8 +136,8 @@
================================================================
Index: packages/tcsh/tcsh-no_TERMCAP.patch
diff -u packages/tcsh/tcsh-no_TERMCAP.patch:1.2
packages/tcsh/tcsh-no_TERMCAP.patch:1.3
--- packages/tcsh/tcsh-no_TERMCAP.patch:1.2 Thu Apr 9 11:45:48 2009
+++ packages/tcsh/tcsh-no_TERMCAP.patch Thu May 10 08:06:49 2012
@@ -1,6 +1,6 @@
--- tcsh-6.12.00/ed.screen.c~ Sun May 18 04:50:03 2003
+++ tcsh-6.12.00/ed.screen.c Sun May 18 04:50:03 2003
-@@ -1681,59 +1681,6 @@
+@@ -1681,25 +1681,6 @@
cleanup_until(p);
}
@@ -13,43 +13,9 @@
- (void) Strncpy(termcap, ptr, TC_BUFSIZE);
- termcap[TC_BUFSIZE-1] = '\0';
-
-- /* update termcap string; first do columns */
-- buf[0] = 'c';
-- buf[1] = 'o';
-- buf[2] = '#';
-- buf[3] = '\0';
-- if ((ptr = Strstr(termcap, buf)) == NULL) {
-- (void) Strcpy(backup, termcap);
-- }
-- else {
-- size_t len = (ptr - termcap) + Strlen(buf);
-- (void) Strncpy(backup, termcap, len);
-- backup[len] = '\0';
-- p = Itoa(Val(T_co), 0, 0);
-- (void) Strcat(backup + len, p);
-- xfree(p);
-- ptr = Strchr(ptr, ':');
-- (void) Strcat(backup, ptr);
-- }
+- UpdateVal(STRco, Val(T_co), termcap, backup);
+- UpdateVal(STRli, Val(T_li), termcap, backup);
-
-- /* now do lines */
-- buf[0] = 'l';
-- buf[1] = 'i';
-- buf[2] = '#';
-- buf[3] = '\0';
-- if ((ptr = Strstr(backup, buf)) == NULL) {
-- (void) Strcpy(termcap, backup);
-- }
-- else {
-- size_t len = (ptr - backup) + Strlen(buf);
-- (void) Strncpy(termcap, backup, len);
-- termcap[len] = '\0';
-- p = Itoa(Val(T_li), 0, 0);
-- (void) Strcat(termcap, p);
-- xfree(p);
-- ptr = Strchr(ptr, ':');
-- (void) Strcat(termcap, ptr);
-- }
- /*
- * Chop the termcap string at TC_BUFSIZE-1 characters to avoid
- * core-dumps in the termcap routines
================================================================
Index: packages/tcsh/tcsh-termios.patch
diff -u packages/tcsh/tcsh-termios.patch:1.1
packages/tcsh/tcsh-termios.patch:1.2
--- packages/tcsh/tcsh-termios.patch:1.1 Sun Mar 12 06:15:29 2000
+++ packages/tcsh/tcsh-termios.patch Thu May 10 08:06:49 2012
@@ -9,25 +9,3 @@
#ifdef _SEQUENT_
# include <sys/procstats.h>
#endif /* _SEQUENT_ */
-@@ -249,12 +251,10 @@
- # else
- # include <termio.h>
- # endif /* _UWIN */
--# if SYSVREL > 3
- # undef TIOCGLTC /* we don't need those, since POSIX has them */
- # undef TIOCSLTC
- # undef CSWTCH
- # define CSWTCH _POSIX_VDISABLE /* So job control works */
--# endif /* SYSVREL > 3 */
- # endif /* POSIX */
- #endif /* WINNT */
-
-@@ -312,6 +312,8 @@
- #if !((defined(SUNOS4) || defined(_MINIX) /* || defined(DECOSF1) */) &&
defined(TERMIO))
- # if !defined(COHERENT) && !defined(_VMS_POSIX) && !defined(WINNT)
- # include <sys/ioctl.h>
-+# undef TIOCGLTC /* we don't need those, since POSIX has them */
-+# undef TIOCSLTC
- # endif
- #endif
-
================================================================
Index: packages/tcsh/tcsh.spec
diff -u packages/tcsh/tcsh.spec:1.90 packages/tcsh/tcsh.spec:1.91
--- packages/tcsh/tcsh.spec:1.90 Sat Sep 10 15:04:51 2011
+++ packages/tcsh/tcsh.spec Thu May 10 08:06:49 2012
@@ -4,7 +4,7 @@
%bcond_with working_history # compiles tcsh with timestamps in
# ~/.history file so it serves any real purpose
(which
# is not the case for default PLD tcsh)
-%bcond_without static # don't build static version
+%bcond_with static # don't build static version
#
Summary: Enhanced c-shell
Summary(de.UTF-8): Erweiterte C-Shell
@@ -17,12 +17,12 @@
Summary(tr.UTF-8): Gelişmiş c-kabuğu (c-shell)
Summary(uk.UTF-8): Покращена верся csh
Name: tcsh
-Version: 6.17.00
-Release: 6
+Version: 6.18.01
+Release: 1
License: distributable
Group: Applications/Shells
Source0: ftp://ftp.astron.com/pub/tcsh/%{name}-%{version}.tar.gz
-# Source0-md5: c47de903e3d52f6824c8dd0c91eeb477
+# Source0-md5: 6eed09dbd4223ab5b6955378450d228a
Source1: csh.cshrc
Source2: csh.login
Source3: %{name}-skel-.login
@@ -32,8 +32,6 @@
Patch3: %{name}-time.patch
Patch4: %{name}-rlimit_locks.patch
Patch5: %{name}-no_TERMCAP.patch
-Patch6: %{name}-nls-codesets.patch
-Patch7: %{name}-sysmalloc.patch
URL: http://www.tcsh.org/Home
BuildRequires: autoconf >= 2.59
BuildRequires: automake
@@ -123,8 +121,6 @@
%patch3 -p1
%patch4 -p1
%patch5 -p1
-%patch6 -p1
-%patch7 -p1
%build
cp /usr/share/automake/config.sub .
@@ -145,29 +141,22 @@
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/etc/skel,%{_mandir}/man1,%{_bindir}} \
- $RPM_BUILD_ROOT%{_datadir}/locale/{el,es,fr,it,ja}
+install -d $RPM_BUILD_ROOT/etc/skel
+
+%{__make} install \
+ DESTDIR=$RPM_BUILD_ROOT
%if %{with static}
install tcsh.static $RPM_BUILD_ROOT%{_bindir}
%endif
-install tcsh $RPM_BUILD_ROOT%{_bindir}
-install tcsh.man $RPM_BUILD_ROOT%{_mandir}/man1/tcsh.1
echo .so tcsh.1 > $RPM_BUILD_ROOT%{_mandir}/man1/csh.1
ln -sf tcsh $RPM_BUILD_ROOT%{_bindir}/csh
-nroff -me eight-bit.me > eight-bit.txt
install %{SOURCE1} %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}
install %{SOURCE3} $RPM_BUILD_ROOT/etc/skel/.login
-install tcsh.french.cat $RPM_BUILD_ROOT%{_datadir}/locale/fr/tcsh
-install tcsh.italian.cat $RPM_BUILD_ROOT%{_datadir}/locale/it/tcsh
-install tcsh.ja.cat $RPM_BUILD_ROOT%{_datadir}/locale/ja/tcsh
-install tcsh.greek.cat $RPM_BUILD_ROOT%{_datadir}/locale/el/tcsh
-install tcsh.spanish.cat $RPM_BUILD_ROOT%{_datadir}/locale/es/tcsh
-
%clean
rm -rf $RPM_BUILD_ROOT
@@ -212,11 +201,17 @@
%attr(755,root,root) %{_bindir}/csh
%attr(755,root,root) %{_bindir}/tcsh
-%lang(fr) %{_datadir}/locale/fr/tcsh
-%lang(it) %{_datadir}/locale/it/tcsh
-%lang(ja) %{_datadir}/locale/ja/tcsh
-%lang(el) %{_datadir}/locale/el/tcsh
-%lang(es) %{_datadir}/locale/es/tcsh
+%{_datadir}/locale/C/LC_MESSAGES/tcsh.cat
+%lang(de) %{_datadir}/locale/de/LC_MESSAGES/tcsh.cat
+%lang(es) %{_datadir}/locale/es/LC_MESSAGES/tcsh.cat
+%lang(et) %{_datadir}/locale/et/LC_MESSAGES/tcsh.cat
+%lang(fi) %{_datadir}/locale/fi/LC_MESSAGES/tcsh.cat
+%lang(fr) %{_datadir}/locale/fr/LC_MESSAGES/tcsh.cat
+%lang(gr) %{_datadir}/locale/gr/LC_MESSAGES/tcsh.cat
+%lang(it) %{_datadir}/locale/it/LC_MESSAGES/tcsh.cat
+%lang(ja) %{_datadir}/locale/ja/LC_MESSAGES/tcsh.cat
+%lang(pl) %{_datadir}/locale/pl/LC_MESSAGES/tcsh.cat
+%lang(ru) %{_datadir}/locale/ru/LC_MESSAGES/tcsh.cat
%{_mandir}/man1/*
%if %{with static}
@@ -231,6 +226,14 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.91 2012/05/10 06:06:49 baggins
+- updated to 6.18.01
+- removed obsolete patches
+- static tcsh cannot be built anymore due to deps between static libcrypt and
+ shared nss-softonk-freebl
+- install via make install
+- updated files
+
Revision 1.90 2011/09/10 13:04:51 qboosh
- ac version
================================================================
---- CVS-web:
http://cvs.pld-linux.org/packages/tcsh/tcsh-misc.patch?r1=1.4&r2=1.5
http://cvs.pld-linux.org/packages/tcsh/tcsh-no_TERMCAP.patch?r1=1.2&r2=1.3
http://cvs.pld-linux.org/packages/tcsh/tcsh-termios.patch?r1=1.1&r2=1.2
http://cvs.pld-linux.org/packages/tcsh/tcsh.spec?r1=1.90&r2=1.91
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
