diff --git a/.gitignore b/.gitignore index 0633b2a..6202936 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /xterm-284.tgz +/xterm-286.tgz diff --git a/sources b/sources index 12315cb..d7670fa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fa6bd90b91365f41c6bb895bee054c12 xterm-284.tgz +a72ac3809b3338899d97c17e13a9102a xterm-286.tgz diff --git a/xterm-man-paths.patch b/xterm-man-paths.patch index 1050506..107d9d4 100644 --- a/xterm-man-paths.patch +++ b/xterm-man-paths.patch @@ -1,9 +1,9 @@ -diff -up xterm-284/minstall.in.man-paths xterm-284/minstall.in ---- xterm-284/minstall.in.man-paths 2012-10-14 21:45:07.000000000 +0200 -+++ xterm-284/minstall.in 2012-10-15 12:23:37.602431393 +0200 -@@ -118,12 +118,17 @@ 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 +diff -up xterm-286/minstall.in.man-paths xterm-286/minstall.in +--- xterm-286/minstall.in.man-paths 2012-10-29 10:23:22.000000000 +0100 ++++ xterm-286/minstall.in 2012-10-30 14:28:00.740493383 +0100 +@@ -122,6 +122,11 @@ VERSION_H=`echo "$OLD_FILE" | sed -e 's, + PATCH_NUM=`fgrep XTERM_PATCH $VERSION_H|sed -e 's/[^0-9]*//g'` + PATCH_YMD=`fgrep XTERM_DATE $VERSION_H|sed -e 's,[^0-9/.-]*,,g'` +fontpath=/usr/share/X11/fonts +xorgcfgdir=/etc/X11 @@ -12,16 +12,8 @@ diff -up xterm-284/minstall.in.man-paths xterm-284/minstall.in + # Provide for renaming in test-builds: APP_Name=`echo "$APP_name" | sed -e s/xterm/Xterm/` - - sed -e 's%__vendorversion__%"X Window System"%' \ -- -e "s%^\.ds N Xterm%.ds n $APP_Name%" \ -- -e "s%^\.ds n xterm%.ds N $APP_name%" \ -+ -e "s%^\.ds N Xterm%.ds N $APP_Name%" \ -+ -e "s%^\.ds n xterm%.ds n $APP_name%" \ - -e s%__default_termname__%@default_TERM@% \ - -e s%__default_termid__%@default_termid@% \ - -e s%__alt_sends_esc__%@alt_sends_esc@% \ -@@ -140,6 +145,9 @@ sed -e 's%__vendorversion__%"X Window Sy + APP_NAME=`echo "$APP_name" | tr '[a-z]' '[A-Z]'` +@@ -148,6 +153,9 @@ sed -e 's%__vendorversion__%"X Window Sy -e s%/etc/utmp%$UTMP_PATH%g \ -e s%fIwtmp'\\%fI'$WTMP_NAME'\\%g' \ -e s%/etc/wtmp%$WTMP_PATH%g \ @@ -31,10 +23,10 @@ diff -up xterm-284/minstall.in.man-paths xterm-284/minstall.in $OLD_FILE >$NEW_FILE echo "$MINSTALL $OLD_FILE $END_FILE" -diff -up xterm-284/xterm.man.man-paths xterm-284/xterm.man ---- xterm-284/xterm.man.man-paths 2012-10-14 21:47:51.000000000 +0200 -+++ xterm-284/xterm.man 2012-10-15 12:19:30.161179717 +0200 -@@ -1961,17 +1961,17 @@ Since X11R6, bitmap fonts have been scal +diff -up xterm-286/xterm.man.man-paths xterm-286/xterm.man +--- xterm-286/xterm.man.man-paths 2012-10-26 01:25:26.000000000 +0200 ++++ xterm-286/xterm.man 2012-10-30 14:23:29.450221640 +0100 +@@ -1962,17 +1962,17 @@ Since X11R6, bitmap fonts have been scal The font server claims to provide the bold font that \fI\*n\fP requests, but the result is not always readable. XFree86 introduced a feature which can be used to suppress the scaling. diff --git a/xterm.spec b/xterm.spec index f24aebb..e745874 100644 --- a/xterm.spec +++ b/xterm.spec @@ -1,6 +1,6 @@ Summary: Terminal emulator for the X Window System Name: xterm -Version: 284 +Version: 286 Release: 1%{?dist} URL: http://invisible-island.net/xterm License: MIT @@ -95,6 +95,9 @@ fi %{x11_app_defaults_dir}/XTerm* %changelog +* Tue Oct 30 2012 Miroslav Lichvar 286-1 +- update to 286 + * Mon Oct 15 2012 Miroslav Lichvar 284-1 - update to 284