diff --git a/.gitignore b/.gitignore index 768d107..bd8ae46 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ /16colors.txt -/xterm-270.tgz +/xterm-271.tgz diff --git a/sources b/sources index e6bf3bb..a34a4f1 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ 6093439b8d79089f4ff1cdfed358b401 16colors.txt -92d654f3aa4ad694a4f61d980d14c24b xterm-270.tgz +e07b05bd3d3a666a8cf086fcc8d227f3 xterm-271.tgz diff --git a/xterm-256-man-page_paths.patch b/xterm-271-man-page_paths.patch similarity index 60% rename from xterm-256-man-page_paths.patch rename to xterm-271-man-page_paths.patch index 6bfd46d..c163eb1 100644 --- a/xterm-256-man-page_paths.patch +++ b/xterm-271-man-page_paths.patch @@ -1,6 +1,6 @@ -diff -up xterm-256/minstall.sh.man-page_paths xterm-256/minstall.sh ---- xterm-256/minstall.sh.man-page_paths 2010-03-04 00:44:49.000000000 +0100 -+++ xterm-256/minstall.sh 2010-03-09 12:11:26.000000000 +0100 +diff -up xterm-271/minstall.sh.man-page_paths xterm-271/minstall.sh +--- xterm-271/minstall.sh.man-page_paths 2010-03-04 00:44:49.000000000 +0100 ++++ xterm-271/minstall.sh 2011-07-15 13:23:02.758313247 +0200 @@ -109,6 +109,10 @@ WTMP_PATH=$WTMP_PATH/$WTMP_NAME X_MANSECT=`man X 2>&1 | tr '\012' '\020' | sed -e 's/^[^0123456789]*\([^) ][^) ]*\).*/\1/'` test -z "$X_MANSECT" && X_MANSECT=$suffix @@ -22,17 +22,18 @@ diff -up xterm-256/minstall.sh.man-page_paths xterm-256/minstall.sh $OLD_FILE >$NEW_FILE echo "$MINSTALL $OLD_FILE $END_FILE" -diff -up xterm-256/xterm.man.man-page_paths xterm-256/xterm.man ---- xterm-256/xterm.man.man-page_paths 2010-03-03 23:30:35.000000000 +0100 -+++ xterm-256/xterm.man 2010-03-09 12:11:26.000000000 +0100 -@@ -1699,17 +1699,17 @@ Since X11R6, bitmap fonts have been scal +diff -up xterm-271/xterm.man.man-page_paths xterm-271/xterm.man +--- xterm-271/xterm.man.man-page_paths 2011-07-13 10:59:37.000000000 +0200 ++++ xterm-271/xterm.man 2011-07-15 13:27:51.653634499 +0200 +@@ -1825,18 +1825,18 @@ Since X11R6, bitmap fonts have been scal The font server claims to provide the bold font that \fIxterm\fP requests, but the result is not always readable. XFree86 provides a feature which can be used to suppress the scaling. --In the X server's configuration file (e.g., "/etc/X11/XFree86"), you -+In the X server's configuration file (e.g., __xorgcfgdir__/__xorgcfgfil__), you - can add ":unscaled" to the end of the directory specification for the - "misc" fonts, which comprise the fixed-pitch fonts that are used by \fIxterm\fP. +-In the X server's configuration file (e.g., \*(``/etc/X11/XFree86\*(''), you ++In the X server's configuration file (e.g., \*(``__xorgcfgdir__/__xorgcfgfil__\*(''), you + can add \*(``:unscaled\*('' to the end of the directory specification for the + \*(``misc\*('' fonts, + which comprise the fixed-pitch fonts that are used by \fIxterm\fP. For example .RS - FontPath "/usr/lib/X11/fonts/misc/" diff --git a/xterm.spec b/xterm.spec index 6c2e70e..ecdb274 100644 --- a/xterm.spec +++ b/xterm.spec @@ -1,6 +1,6 @@ Summary: Terminal emulator for the X Window System Name: xterm -Version: 270 +Version: 271 Release: 1%{?dist} URL: http://dickey.his.com/xterm License: MIT @@ -15,7 +15,7 @@ Source1: ftp://invisible-island.net/xterm/16colors.txt Patch1: xterm-245-resources.patch Patch2: xterm-261-desk.patch -Patch3: xterm-256-man-page_paths.patch +Patch3: xterm-271-man-page_paths.patch %bcond_with trace @@ -85,6 +85,9 @@ rm -rf $RPM_BUILD_ROOT %{x11_app_defaults_dir}/XTerm* %changelog +* Fri Jul 15 2011 Miroslav Lichvar 271-1 +- update to 271 + * Wed Apr 27 2011 Miroslav Lichvar 270-1 - update to 270