packages: xterm/xterm.spec, xterm/xterm-tinfo.patch (NEW) - updated to 261 ...

[qboosh]

Author: qboosh                       Date: Sat Jul 10 18:15:05 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 261
- added tinfo patch

---- Files affected:
packages/xterm:
   xterm.spec (1.52 -> 1.53) , xterm-tinfo.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/xterm/xterm.spec
diff -u packages/xterm/xterm.spec:1.52 packages/xterm/xterm.spec:1.53
--- packages/xterm/xterm.spec:1.52	Thu Mar 11 09:04:05 2010
+++ packages/xterm/xterm.spec	Sat Jul 10 20:15:00 2010
@@ -2,16 +2,17 @@
 Summary:	Terminal emulator for X
 Summary(pl.UTF-8):	Emulator terminala dla X
 Name:		xterm
-Version:	253
+Version:	261
 Release:	1
 License:	MIT
 Group:		X11/Applications
 Source0:	ftp://invisible-island.net/xterm/%{name}-%{version}.tgz
-# Source0-md5:	363cc4865b7691bd0ae5eebb42cde9c9
+# Source0-md5:	10d211f6986c4b279cfa9530b2361457
 Source1:	XTerm.ad-pl
 Source2:	%{name}.desktop
 Source3:	%{name}.png
 Source4:	%{name}.1x.ko
+Patch0:		%{name}-tinfo.patch
 URL:		http://invisible-island.net/xterm/
 BuildRequires:	ncurses-devel
 BuildRequires:	pkgconfig
@@ -41,8 +42,10 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
+# don't run autoconf, modified version of autoconf is required
 CPPFLAGS="-I/usr/include/ncurses %{rpmcppflags}"
 %configure \
 	--enable-256-color \
@@ -50,8 +53,7 @@
 	--with-app-defaults=%{_datadir}/X11/app-defaults \
 	--with-utempter
 
-%{__make} \
-	EXTRA_LOADFLAGS="-ltinfo"
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -78,9 +80,11 @@
 %attr(755,root,root) %{_bindir}/uxterm
 %attr(755,root,root) %{_bindir}/koi8rxterm
 %{_datadir}/X11/app-defaults/UXTerm
+%{_datadir}/X11/app-defaults/UXTerm-color
 %{_datadir}/X11/app-defaults/XTerm
 %{_datadir}/X11/app-defaults/XTerm-color
 %{_datadir}/X11/app-defaults/KOI8RXTerm
+%{_datadir}/X11/app-defaults/KOI8RXTerm-color
 %lang(pl) %{_datadir}/X11/pl/app-defaults/XTerm
 %{_desktopdir}/xterm.desktop
 %{_pixmapsdir}/xterm.png
@@ -97,6 +101,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.53  2010/07/10 18:15:00  qboosh
+- updated to 261
+- added tinfo patch
+
 Revision 1.52  2010/03/11 08:04:05  arekm
 - include rpmcppflags
 

================================================================
Index: packages/xterm/xterm-tinfo.patch
diff -u /dev/null packages/xterm/xterm-tinfo.patch:1.1
--- /dev/null	Sat Jul 10 20:15:05 2010
+++ packages/xterm/xterm-tinfo.patch	Sat Jul 10 20:14:59 2010
@@ -0,0 +1,30 @@
+--- xterm-261/aclocal.m4.orig	2010-06-14 23:44:02.000000000 +0200
++++ xterm-261/aclocal.m4	2010-07-10 07:42:39.153394253 +0200
+@@ -522,10 +522,10 @@
+ cf_save_LIBS="$LIBS"
+ cf_cv_lib_tgetent=no
+ if test "$cf_full_tgetent" = yes ; then
+-	cf_TERMLIB="termcap termlib ncurses curses"
++	cf_TERMLIB="tinfo ncurses curses termcap termlib"
+ 	cf_TERMTST="buffer[[0]] == 0"
+ else
+-	cf_TERMLIB="termlib ncurses curses"
++	cf_TERMLIB="tinfo ncurses curses termlib"
+ 	cf_TERMTST="0"
+ fi
+ for cf_termlib in '' $cf_TERMLIB ; do
+--- xterm-261/configure.orig	2010-06-16 00:50:26.000000000 +0200
++++ xterm-261/configure	2010-07-10 07:59:07.086654096 +0200
+@@ -5479,10 +5479,10 @@
+ cf_save_LIBS="$LIBS"
+ cf_cv_lib_tgetent=no
+ if test "$cf_full_tgetent" = yes ; then
+-	cf_TERMLIB="termcap termlib ncurses curses"
++	cf_TERMLIB="tinfo ncurses curses termcap termlib"
+ 	cf_TERMTST="buffer[0] == 0"
+ else
+-	cf_TERMLIB="termlib ncurses curses"
++	cf_TERMLIB="tinfo ncurses curses termlib"
+ 	cf_TERMTST="0"
+ fi
+ for cf_termlib in '' $cf_TERMLIB ; do
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xterm/xterm.spec?r1=1.52&r2=1.53&f=u