From df65fe153761470723b9ba9e7481469af8569d15 Mon Sep 17 00:00:00 2001 From: jvdias Date: Mar 21 2006 22:49:56 +0000 Subject: upgrade to upstream version 211 - fixes bug 186094 --- diff --git a/.cvsignore b/.cvsignore index 56b1b90..3ec9660 100644 --- a/.cvsignore +++ b/.cvsignore @@ -9,3 +9,4 @@ UnicodeData-Latest.txt.gz 16colors.txt xterm-208.tgz xterm-209.tgz +xterm-211.tgz diff --git a/sources b/sources index 3bf25fb..802f280 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -c75cdbf9395bbc2cd69863fbe7c2e019 xterm-209.tgz 0048925cb45d60429bc2f7665d563680 ctlseqs.txt.gz 92826989d4f4aa610cf6222359f3f83a UnicodeData-Latest.txt.gz 6093439b8d79089f4ff1cdfed358b401 16colors.txt +babb9a02ba7ebb7770f48e3257b2884e xterm-211.tgz diff --git a/xterm.spec b/xterm.spec index e31bc5d..e08bbba 100644 --- a/xterm.spec +++ b/xterm.spec @@ -1,7 +1,7 @@ Summary: xterm terminal emulator for the X Window System Name: xterm -Version: 209 -Release: 4 +Version: 211 +Release: 1.FC6 URL: http://dickey.his.com/xterm License: MIT Group: User Interface/X @@ -21,6 +21,8 @@ Patch7: xterm-209-redhat-resources.patch Patch8: xterm-208-root-grab-console.patch Patch9: xterm-209-bz182382.patch Patch10: xterm-209-bz183993.patch +Patch11: xterm-211-bz186094.patch + BuildRequires: libXft-devel BuildRequires: freetype-devel BuildRequires: libXrender-devel @@ -39,6 +41,11 @@ BuildRequires: zlib-devel BuildRequires: libtermcap-devel BuildRequires: utempter +%{?!DEBUGINFO: %define DEBUGINFO 1} +%if !%{DEBUGINFO} +%define debug_package %{nil} +%endif + %define x11_app_defaults_dir %{_datadir}/X11/app-defaults %{?!_with_256_color: %define _with_256_color 1} %{?!_with_tek4014: %define _with_tek4014 1} @@ -62,8 +69,11 @@ programs that can't use the window system directly. #%patch6 -p1 -b .eightBitInput_false %patch7 -p1 -b .redhat-resources %patch8 -p1 -b .root-grab-console -%patch9 -p1 -b .bz182382 -%patch10 -p1 -b .bz183993 +#%patch9 -p1 -b .bz182382 +# ^- patch now upstream +#%patch10 -p1 -b .bz183993 +# ^- patch now upstream +%patch11 -p1 -b .bz186094 %build RPM_OPT_FLAGS="$RPM_OPT_FLAGS -DPROJECTROOT='\"/usr\"'" @@ -92,6 +102,10 @@ mv $RPM_BUILD_ROOT/%{_mandir}/*.1 $RPM_BUILD_ROOT/%{_mandir}/man1/ gunzip < %SOURCE1 > ctlseqs.txt gunzip < %SOURCE2 > UnicodeData.txt cp -fp %SOURCE3 16colors.txt +%if !%{DEBUGINFO} +/usr/lib/rpm/brp-compress +exit 0 +%endif %clean #rm -rf $RPM_BUILD_ROOT @@ -109,6 +123,10 @@ cp -fp %SOURCE3 16colors.txt %doc xterm.log.html ctlseqs.ms ctlseqs.txt UnicodeData.txt 16colors.txt README.i18n %changelog +* Tue Mar 21 2006 Jason Vas Dias - 211-1 +- Upgrade to upstream version 211 (fixes bug 186094). +- Enable new 'utf8Title' resource by default + * Tue Mar 07 2006 Jason Vas Dias - 209-4 - fix bug 183993: call set_cursor_gcs in ReverseVideo