rpms/xterm
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- update to 226

Browse Source
This commit is contained in:
Miroslav Lichvar 2007-06-22 10:58:53 +00:00
parent 4715263f63
commit 3ca03494f1
4 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cvsignore
View File

@ -1,2 +1,2 @@
16colors.txt
xterm-225.tgz
xterm-226.tgz

2
sources
View File

@ -1,2 +1,2 @@
6093439b8d79089f4ff1cdfed358b401 16colors.txt
dbd31341a9ccb982647416e8d27b0f00 xterm-225.tgz
93d1f43ac3c13af86c598493f14a36f6 xterm-226.tgz

35
xterm-222-man-page_paths.patch → xterm-226-man-page_paths.patch
View File

@ -1,6 +1,6 @@
--- 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 @@
--- 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,
@ -9,7 +9,7 @@
(if configured to do so),
whereas \fIxterm\ -e\fP does not.
.TP 8
@@ -1458,17 +1458,17 @@
@@ -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.
@ -30,7 +30,7 @@
.RE
.IP
Depending on your configuration, the font server may have its own configuration
@@ -4368,10 +4368,10 @@
@@ -4596,10 +4596,10 @@ may be defined to a nonstandard location
.SH FILES
The actual pathnames given may differ on your system.
.TP 5
@ -43,26 +43,23 @@
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"
--- 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
-suffix=`echo "$END_FILE" | sed -e 's%^[^.]*.%%'`
+fontpath=/usr/share/X11/fonts
+xorgcfgdir=/etc/X11
+xorgcfgfil=xorg.conf
+suffix=7
NEW_FILE=temp$$
+X_MANSECT=7
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 \
-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"

12
xterm.spec
View File

@ -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 <mlichvar@redhat.com> 226-1
- update to 226
* Thu Apr 12 2007 Miroslav Lichvar <mlichvar@redhat.com> 225-2
- fix sections in man pages