From f55a7d723cc0e3b4e6f1a102db12303addeb6589 Mon Sep 17 00:00:00 2001 From: jvdias Date: Mon, 17 Jul 2006 22:19:56 +0000 Subject: [PATCH] upgrade to upstream version 215 --- .cvsignore | 1 + sources | 3 +-- xterm.spec | 16 +++++++++++----- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.cvsignore b/.cvsignore index cb68e85..8518410 100644 --- a/.cvsignore +++ b/.cvsignore @@ -12,3 +12,4 @@ xterm-209.tgz xterm-211.tgz xterm-212.tgz xterm-213.tgz +xterm-215.tgz diff --git a/sources b/sources index 3cd8f63..240a3ce 100644 --- a/sources +++ b/sources @@ -1,4 +1,3 @@ -0048925cb45d60429bc2f7665d563680 ctlseqs.txt.gz 92826989d4f4aa610cf6222359f3f83a UnicodeData-Latest.txt.gz 6093439b8d79089f4ff1cdfed358b401 16colors.txt -20827d968ed7406d01b2125a84b7a2cd xterm-213.tgz +8c2a45d4ca754b2cb019242e26f657eb xterm-215.tgz diff --git a/xterm.spec b/xterm.spec index ea8470d..88375b5 100644 --- a/xterm.spec +++ b/xterm.spec @@ -1,13 +1,14 @@ Summary: xterm terminal emulator for the X Window System Name: xterm -Version: 213 -Release: 2.1%{?dist} +Version: 215 +Release: 1%{?dist} URL: http://dickey.his.com/xterm License: MIT Group: User Interface/X BuildRoot: %{_tmppath}/%{name}-root Source0: ftp://invisible-island.net/xterm/%{name}-%{version}.tgz -Source1: ftp://invisible-island.net/xterm/ctlseqs.txt.gz +#Source1: ftp://invisible-island.net/xterm/ctlseqs.txt.gz +# ^- now shipped in upstream source tarball Source2: ftp://invisible-island.net/xterm/UnicodeData-Latest.txt.gz Source3: ftp://invisible-island.net/xterm/16colors.txt Patch0: xterm-can-2003-0063.patch @@ -80,7 +81,8 @@ programs that can't use the window system directly. # ^- patch now upstream #%patch11 -p1 -b .bz186094 # ^- patch now in redhat-resources -%patch12 -p1 -b .bz186935 +#%patch12 -p1 -b .bz186935 +# ^- patch now upstream %patch13 -p1 -b .redhat-resources %patch14 -p1 -b .man-page_paths %patch15 -p1 -b .bz189161 @@ -116,7 +118,8 @@ rm -rf $RPM_BUILD_ROOT %makeinstall appsdir=$RPM_BUILD_ROOT/%{x11_app_defaults_dir} apploaddir=%{x11_app_defaults_dir} mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1 mv $RPM_BUILD_ROOT/%{_mandir}/*.1 $RPM_BUILD_ROOT/%{_mandir}/man1/ -gunzip < %SOURCE1 > ctlseqs.txt +#gunzip < %SOURCE1 > ctlseqs.txt +# ^- now shipped in upstream tarball gunzip < %SOURCE2 > UnicodeData.txt cp -fp %SOURCE3 16colors.txt %if !%{DEBUGINFO} @@ -140,6 +143,9 @@ exit 0 %doc xterm.log.html ctlseqs.ms ctlseqs.txt UnicodeData.txt 16colors.txt README.i18n %changelog +* Mon Jul 17 2006 Jason Vas Dias - 215-1.fc6 +- Upgrade to upstream version 215 + * Wed Jul 12 2006 Jesse Keating - 213-2.1 - rebuild