diff --git a/.cvsignore b/.cvsignore index db082d0..4dd29f7 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ 16colors.txt -xterm-225.tgz +xterm-226.tgz diff --git a/sources b/sources index 71275f5..a238bf2 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ 6093439b8d79089f4ff1cdfed358b401 16colors.txt -dbd31341a9ccb982647416e8d27b0f00 xterm-225.tgz +93d1f43ac3c13af86c598493f14a36f6 xterm-226.tgz diff --git a/xterm-222-man-page_paths.patch b/xterm-222-man-page_paths.patch deleted file mode 100644 index 6def03d..0000000 --- a/xterm-222-man-page_paths.patch +++ /dev/null @@ -1,68 +0,0 @@ ---- xterm-222/xterm.man.man-page_paths 2006-08-11 03:01:11.000000000 +0200 -+++ xterm-222/xterm.man 2006-11-23 10:22:28.000000000 +0100 -@@ -677,7 +677,7 @@ - .RE - .IP - Finally, \fB-ls\fP is not completely ignored, --because \fIxterm\ -ls\ -e\fP does write a \fI/etc/wtmp\fP entry -+because \fIxterm\ -ls\ -e\fP does write a \fI/var/log/wtmp\fP entry - (if configured to do so), - whereas \fIxterm\ -e\fP does not. - .TP 8 -@@ -1458,17 +1458,17 @@ - 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. - For example - .RS -- FontPath "/usr/lib/X11/fonts/misc/" -+ FontPath "__fontpath__" - .RE - .IP - would become - .RS -- FontPath "/usr/lib/X11/fonts/misc/:unscaled" -+ FontPath "__fontpath__/misc/:unscaled" - .RE - .IP - Depending on your configuration, the font server may have its own configuration -@@ -4368,10 +4368,10 @@ - .SH FILES - The actual pathnames given may differ on your system. - .TP 5 --\fI/etc/utmp\fP -+\fI/var/run/utmp\fP - the system logfile, which records user logins. - .TP 5 --\fI/etc/wtmp\fP -+\fI/var/log/wtmp\fP - the system logfile, which records user logins and logouts. - .TP 5 - .I __apploaddir__/XTerm ---- xterm-222/minstall.sh.man-page_paths 2006-04-10 02:34:37.000000000 +0200 -+++ xterm-222/minstall.sh 2006-11-23 10:23:39.000000000 +0100 -@@ -16,13 +16,19 @@ - END_FILE="$3" - APPS_DIR="$4" - --suffix=`echo "$END_FILE" | sed -e 's%^[^.]*.%%'` -+fontpath=/usr/share/X11/fonts -+xorgcfgdir=/etc/X11 -+xorgcfgfil=xorg.conf -+suffix=7 - NEW_FILE=temp$$ - - sed -e 's%__vendorversion__%"X Window System"%' \ - -e s%__apploaddir__%$APPS_DIR% \ - -e s%__mansuffix__%$suffix%g \ - -e s%__miscmansuffix__%$suffix%g \ -+ -e s%__fontpath__%$fontpath%g \ -+ -e s%__xorgcfgdir__%$xorgcfgdir%g \ -+ -e s%__xorgcfgfil__%$xorgcfgfil%g \ - $OLD_FILE >$NEW_FILE - - echo "$MINSTALL $OLD_FILE $END_FILE" diff --git a/xterm-226-man-page_paths.patch b/xterm-226-man-page_paths.patch new file mode 100644 index 0000000..c40c474 --- /dev/null +++ b/xterm-226-man-page_paths.patch @@ -0,0 +1,65 @@ +--- xterm-226/xterm.man.man-page_paths 2007-06-13 23:19:59.000000000 +0200 ++++ xterm-226/xterm.man 2007-06-21 16:06:15.000000000 +0200 +@@ -679,7 +679,7 @@ xterm -e /bin/bash -l -c "my command her + .RE + .IP + Finally, \fB-ls\fP is not completely ignored, +-because \fIxterm\ -ls\ -e\fP does write a \fI/etc/wtmp\fP entry ++because \fIxterm\ -ls\ -e\fP does write a \fI/var/log/wtmp\fP entry + (if configured to do so), + whereas \fIxterm\ -e\fP does not. + .TP 8 +@@ -1575,17 +1575,17 @@ 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. + For example + .RS +- FontPath "/usr/lib/X11/fonts/misc/" ++ FontPath "__fontpath__" + .RE + .IP + would become + .RS +- FontPath "/usr/lib/X11/fonts/misc/:unscaled" ++ FontPath "__fontpath__/misc/:unscaled" + .RE + .IP + Depending on your configuration, the font server may have its own configuration +@@ -4596,10 +4596,10 @@ may be defined to a nonstandard location + .SH FILES + The actual pathnames given may differ on your system. + .TP 5 +-\fI/etc/utmp\fP ++\fI/var/run/utmp\fP + the system logfile, which records user logins. + .TP 5 +-\fI/etc/wtmp\fP ++\fI/var/log/wtmp\fP + the system logfile, which records user logins and logouts. + .TP 5 + .I __apploaddir__/XTerm +--- xterm-226/minstall.sh.man-page_paths 2007-05-25 00:10:42.000000000 +0200 ++++ xterm-226/minstall.sh 2007-06-21 16:29:57.000000000 +0200 +@@ -26,10 +26,17 @@ MY_MANSECT=$suffix + X_MANSECT=`man X 2>&1 | tr '\012' '\020' | sed -e 's/^[^0123456789]*\([^) ][^) ]*\).*/\1/'` + test -z "$X_MANSECT" && X_MANSECT=$suffix + ++fontpath=/usr/share/X11/fonts ++xorgcfgdir=/etc/X11 ++xorgcfgfil=xorg.conf ++X_MANSECT=7 + sed -e 's%__vendorversion__%"X Window System"%' \ + -e s%__apploaddir__%$APPS_DIR% \ + -e s%__mansuffix__%$MY_MANSECT%g \ + -e s%__miscmansuffix__%$X_MANSECT%g \ ++ -e s%__fontpath__%$fontpath%g \ ++ -e s%__xorgcfgdir__%$xorgcfgdir%g \ ++ -e s%__xorgcfgfil__%$xorgcfgfil%g \ + $OLD_FILE >$NEW_FILE + + echo "$MINSTALL $OLD_FILE $END_FILE" diff --git a/xterm.spec b/xterm.spec index ba7b3af..aa4f2d2 100644 --- a/xterm.spec +++ b/xterm.spec @@ -1,7 +1,7 @@ Summary: Terminal emulator for the X Window System Name: xterm -Version: 225 -Release: 2%{?dist} +Version: 226 +Release: 1%{?dist} URL: http://dickey.his.com/xterm License: MIT Group: User Interface/X @@ -15,7 +15,7 @@ Source2: %{name}.desktop Patch1: xterm-223-resources.patch Patch2: xterm-222-can-2003-0063.patch -Patch3: xterm-222-man-page_paths.patch +Patch3: xterm-226-man-page_paths.patch %{?!enable_trace: %define enable_trace 0} @@ -71,12 +71,16 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/uxterm %{_mandir}/man1/resize.1* %{_mandir}/man1/xterm.1* -%{_datadir}/applications/* +%{_datadir}/applications/fedora-xterm.desktop +%{_datadir}/pixmaps/xterm*.xpm %{x11_app_defaults_dir}/UXTerm %{x11_app_defaults_dir}/XTerm %{x11_app_defaults_dir}/XTerm-color %changelog +* Fri Jun 22 2007 Miroslav Lichvar 226-1 +- update to 226 + * Thu Apr 12 2007 Miroslav Lichvar 225-2 - fix sections in man pages