diff --git a/.gitignore b/.gitignore index b2c9fcf..b9c6dfc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /xterm-284.tgz /xterm-286.tgz /xterm-287.tgz +/xterm-288.tgz diff --git a/sources b/sources index d4be48b..b9edffb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0e4385e66d40b5dd6017d02c3db2a4af xterm-287.tgz +b9bef1abf6e397be6fa2e5f534964d17 xterm-288.tgz diff --git a/xterm-man-paths.patch b/xterm-man-paths.patch index 7673905..be20c12 100644 --- a/xterm-man-paths.patch +++ b/xterm-man-paths.patch @@ -1,19 +1,19 @@ -diff -up xterm-287/minstall.in.man-paths xterm-287/minstall.in ---- xterm-287/minstall.in.man-paths 2012-10-29 10:23:22.000000000 +0100 -+++ xterm-287/minstall.in 2012-11-26 17:24:37.331416504 +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'` +diff -up xterm-288/minstall.in.man-paths xterm-288/minstall.in +--- xterm-288/minstall.in.man-paths 2013-01-01 02:18:24.000000000 +0100 ++++ xterm-288/minstall.in 2013-01-10 12:29:33.472774530 +0100 +@@ -136,6 +136,11 @@ USE_chr1=`echo "$USE_name" | sed -e 's/^ + USE_Name=${USE_chr0}${USE_chr1} + USE_NAME=`echo "$USE_name" | tr '[a-z]' '[A-Z]'` +fontpath=/usr/share/X11/fonts +xorgcfgdir=/etc/X11 +xorgcfgfil=xorg.conf +X_MANSECT=7 + - # Provide for renaming in test-builds: - APP_Name=`echo "$APP_name" | sed -e s/xterm/Xterm/` - APP_NAME=`echo "$APP_name" | tr '[a-z]' '[A-Z]'` -@@ -148,6 +153,9 @@ sed -e 's%__vendorversion__%"X Window Sy + sed -e 's%__vendorversion__%"X Window System"%' \ + -e 's%__app_version__%Patch\ \#'$PATCH_NUM% \ + -e 's%__app_date__%'$PATCH_YMD% \ +@@ -159,6 +164,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 \ @@ -21,11 +21,11 @@ diff -up xterm-287/minstall.in.man-paths xterm-287/minstall.in + -e s%__xorgcfgdir__%$xorgcfgdir%g \ + -e s%__xorgcfgfil__%$xorgcfgfil%g \ $OLD_FILE >$NEW_FILE + # diff -u $OLD_FILE $NEW_FILE - echo "$MINSTALL $OLD_FILE $END_FILE" -diff -up xterm-287/xterm.man.man-paths xterm-287/xterm.man ---- xterm-287/xterm.man.man-paths 2012-11-22 19:42:30.000000000 +0100 -+++ xterm-287/xterm.man 2012-11-26 17:25:43.593546008 +0100 +diff -up xterm-288/xterm.man.man-paths xterm-288/xterm.man +--- xterm-288/xterm.man.man-paths 2013-01-01 00:36:19.000000000 +0100 ++++ xterm-288/xterm.man 2013-01-10 12:28:15.852693216 +0100 @@ -1970,18 +1970,18 @@ 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. diff --git a/xterm.spec b/xterm.spec index 20b01ad..d403370 100644 --- a/xterm.spec +++ b/xterm.spec @@ -1,6 +1,6 @@ Summary: Terminal emulator for the X Window System Name: xterm -Version: 287 +Version: 288 Release: 1%{?dist} URL: http://invisible-island.net/xterm License: MIT @@ -95,6 +95,9 @@ fi %{x11_app_defaults_dir}/XTerm* %changelog +* Thu Jan 10 2013 Miroslav Lichvar 288-1 +- update to 288 + * Mon Nov 26 2012 Miroslav Lichvar 287-1 - update to 287