rpms/x3270/devel x3270-3.3-encoding.patch, NONE, 1.1 x3270.desktop, NONE, 1.1 x3270.spec, 1.2, 1.3
Karsten Hopp (karsten)
fedora-extras-commits at redhat.com
Wed Apr 20 10:53:59 UTC 2005
- Previous message (by thread): rpms/gnome-theme-clearlooks/FC-3 .cvsignore, 1.2, 1.3 gnome-theme-clearlooks.spec, 1.1, 1.2 sources, 1.2, 1.3
- Next message (by thread): rpms/x3270/devel x3270-3.3-encoding.patch, NONE, 1.1 x3270.desktop, NONE, 1.1 x3270.spec, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: karsten
Update of /cvs/extras/rpms/x3270/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19796
Modified Files:
x3270.spec
Added Files:
x3270-3.3-encoding.patch x3270.desktop
Log Message:
- spec file cleanups from Chris Ricker <kaboom at oobleck.net>
- remove backup files from rpm patch process
x3270-3.3-encoding.patch:
--- NEW FILE x3270-3.3-encoding.patch ---
--- x3270-3.3/html/Brackets.html.encoding 2005-04-20 12:38:04.000000000 +0200
+++ x3270-3.3/html/Brackets.html 2005-04-20 12:38:52.000000000 +0200
@@ -1,198 +1,198 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <meta name="GENERATOR" content="Mozilla/4.73 [en]C-CCK-MCD (WinNT; U) [Netscape]">
- <meta name="Author" content="Paul Mattes">
- <title>Square Bracket Characters</title>
+<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+ <meta name="GENERATOR" content="Mozilla/4.73 [en]C-CCK-MCD (WinNT; U) [Netscape]">
+ <meta name="Author" content="Paul Mattes">
+ <title>Square Bracket Characters</title>
<link HREF="http://www.w3.org/StyleSheets/Core/Steely" TYPE="text/css" REL="stylesheet">
-</head>
-<body>
-
-<h1>
-Square Bracket Characters</h1>
-
-<h2>
-The Problem</h2>
-Most IBM 3270 emulators have some degree of difficulty with the square-bracket
-characters, <b>[</b> and <b>]</b>. The problem is that there is not a consistent
-definition of what EBCDIC codes represent them. Hosts may define the square
-bracket characters as X'BA' and X'BB' (as defined in the IBM <i>Chararcter
-Set Reference</i> as standard EBCDIC characters), or as X'AD' and X'BD'
-(which is what the IBM C compilers recognize). In addition, some (but not
-all) hosts display these characters with a Graphics Escape (GE) sequence.
-When the host and/or x3270 are misconfigured, the square-bracket characters
-may be displayed as <img SRC="del.jpg" height=23 width=24> and <img SRC="delta.jpg" height=21 width=20>,
-or <b>Ý</b> and <b>¨</b>.
-<h2>
-Host Configuration</h2>
-If you are using ISPF, you may simply need to use the correct terminal
-translation table. According to the IBM's <i>ISPF Planning and Customizing
-(SC28-1298)</i>, Section 3.11, the correct translation table for displaying
-square bracket characters is called <b>3278A</b>.
-<p>In VM/CMS, the commands <b>terminal apl on</b> and <b>set apl on</b>
-cause the X'AD', X'BD', X'BA' and X'BB' characters to be displayed with
-a Graphics Escape (GE) prefix. With <b>terminal apl off</b> and <b>set
-apl off</b> in effect, they are displayed without the GE prefix.
-<h2>
-x3270 Facilities</h2>
-x3270 has two facilities to deal with this situation: character sets and
-keymaps. By selecting the correct character set and keymap, you can set
-up x3270 to generate and display the proper codes for the square-bracket
-characters.
-<blockquote><b>-charset bracket</b> is the default mode, and is used with
-hosts that use X'AD' and X'BD' for the square-bracket characters. It can
-be used if the host displays these characters with or without a GE sequence.</blockquote>
-
-<blockquote><b>-charset us</b> is for use with hosts that use X'BA' and
-X'BB' for the square-bracket characters, and <i>do not</i> display these
-characters with a GE sequence.</blockquote>
-
-<blockquote><b>-apl</b> (an abbreviation for <b>-charset apl</b>, <b>-keymap
-apl</b>) is for use with hosts running APL, which use GE X'AD' and GE X'BD'
-to represent and display the APL2 square-bracket characters.</blockquote>
-Here is a table which summarizes the combinations of characters generated
-and displayed in the various modes.
-<br>
-<center><table BORDER COLS=11 WIDTH="100%" >
-<tr>
-<td><i> </i></td>
-
-<td COLSPAN="2">
-<center><i>keyboard generates</i></center>
-</td>
-
-<td COLSPAN="8">
-<center><i>graphic displayed for EBCDIC codes</i></center>
-</td>
-</tr>
-
-<tr>
-<td><i>x3270 Mode</i></td>
-
-<td>
-<center><i>[ key</i></center>
-</td>
-
-<td>
-<center><i>] key</i></center>
-</td>
-
-<td>
-<center>X'AD'</center>
-</td>
-
-<td>
-<center>X'BD'</center>
-</td>
-
-<td>
-<center>X'BA'</center>
-</td>
-
-<td>
-<center>X'BB'</center>
-</td>
-
-<td>
-<center>GE X'BA'</center>
-</td>
-
-<td>
-<center>GE X'BB'</center>
-</td>
-
-<td>
-<center>GE X'AD'</center>
-</td>
-
-<td>
-<center>GE X'BD'</center>
-</td>
-</tr>
-
-<tr>
-<td><b>-charset</b> <b>bracket</b> (default)</td>
-
-<td ALIGN=CENTER>X'AD'</td>
-
-<td>
-<center>X'BD'</center>
-</td>
-
-<td>
-<center><b>[</b></center>
-</td>
-
-<td>
-<center><b>]</b></center>
-</td>
-
-<td>
-<center><b>Ý</b></center>
-</td>
-
-<td>
-<center><b>¨</b></center>
-</td>
-
-<td ROWSPAN="3">
-<center><img SRC="del.jpg" height=23 width=24></center>
-</td>
-
-<td ROWSPAN="3">
-<center><img SRC="delta.jpg" height=21 width=20></center>
-</td>
-
-<td ROWSPAN="3">
-<center><b>[</b></center>
-</td>
-
-<td ROWSPAN="3">
-<center><b>]</b></center>
-</td>
-</tr>
-
-<tr>
-<td><b>-charset</b> <b>us</b></td>
-
-<td>
-<center>X'BA'</center>
-</td>
-
-<td>
-<center>X'BB'</center>
-</td>
-
-<td ROWSPAN="2">
-<center><b>Ý</b></center>
-</td>
-
-<td ROWSPAN="2">
-<center><b>¨</b></center>
-</td>
-
-<td ROWSPAN="2">
-<center><b>[</b></center>
-</td>
-
-<td ROWSPAN="2">
-<center><b>]</b></center>
-</td>
-</tr>
-
-<tr>
-<td><b>-apl</b></td>
-
-<td>
-<center>GE X'AD'</center>
-</td>
-
-<td>
-<center>GE X'BD'</center>
-</td>
-</tr>
-</table></center>
-
-</body>
-</html>
+</head>
+<body>
+
+<h1>
+Square Bracket Characters</h1>
+
+<h2>
+The Problem</h2>
+Most IBM 3270 emulators have some degree of difficulty with the square-bracket
+characters, <b>[</b> and <b>]</b>. The problem is that there is not a consistent
+definition of what EBCDIC codes represent them. Hosts may define the square
+bracket characters as X'BA' and X'BB' (as defined in the IBM <i>Character
+Set Reference</i> as standard EBCDIC characters), or as X'AD' and X'BD'
+(which is what the IBM C compilers recognize). In addition, some (but not
+all) hosts display these characters with a Graphics Escape (GE) sequence.
+When the host and/or x3270 are misconfigured, the square-bracket characters
+may be displayed as <img SRC="del.jpg" height=23 width=24> and <img SRC="delta.jpg" height=21 width=20>,
+or <b>Ý</b> and <b>¨</b>.
+<h2>
+Host Configuration</h2>
+If you are using ISPF, you may simply need to use the correct terminal
+translation table. According to the IBM's <i>ISPF Planning and Customizing
+(SC28-1298)</i>, Section 3.11, the correct translation table for displaying
+square bracket characters is called <b>3278A</b>.
+<p>In VM/CMS, the commands <b>terminal apl on</b> and <b>set apl on</b>
+cause the X'AD', X'BD', X'BA' and X'BB' characters to be displayed with
+a Graphics Escape (GE) prefix. With <b>terminal apl off</b> and <b>set
+apl off</b> in effect, they are displayed without the GE prefix.
+<h2>
+x3270 Facilities</h2>
+x3270 has two facilities to deal with this situation: character sets and
+keymaps. By selecting the correct character set and keymap, you can set
+up x3270 to generate and display the proper codes for the square-bracket
+characters.
+<blockquote><b>-charset bracket</b> is the default mode, and is used with
+hosts that use X'AD' and X'BD' for the square-bracket characters. It can
+be used if the host displays these characters with or without a GE sequence.</blockquote>
+
+<blockquote><b>-charset us</b> is for use with hosts that use X'BA' and
+X'BB' for the square-bracket characters, and <i>do not</i> display these
+characters with a GE sequence.</blockquote>
+
+<blockquote><b>-apl</b> (an abbreviation for <b>-charset apl</b>, <b>-keymap
+apl</b>) is for use with hosts running APL, which use GE X'AD' and GE X'BD'
+to represent and display the APL2 square-bracket characters.</blockquote>
+Here is a table which summarizes the combinations of characters generated
+and displayed in the various modes.
+<br>
+<center><table BORDER COLS=11 WIDTH="100%" >
+<tr>
+<td><i> </i></td>
+
+<td COLSPAN="2">
+<center><i>keyboard generates</i></center>
+</td>
+
+<td COLSPAN="8">
+<center><i>graphic displayed for EBCDIC codes</i></center>
+</td>
+</tr>
+
+<tr>
+<td><i>x3270 Mode</i></td>
+
+<td>
+<center><i>[ key</i></center>
+</td>
+
+<td>
+<center><i>] key</i></center>
+</td>
+
+<td>
+<center>X'AD'</center>
+</td>
+
+<td>
+<center>X'BD'</center>
+</td>
+
+<td>
+<center>X'BA'</center>
+</td>
+
+<td>
+<center>X'BB'</center>
+</td>
+
+<td>
+<center>GE X'BA'</center>
+</td>
+
+<td>
+<center>GE X'BB'</center>
+</td>
+
+<td>
+<center>GE X'AD'</center>
+</td>
+
+<td>
+<center>GE X'BD'</center>
+</td>
+</tr>
+
+<tr>
+<td><b>-charset</b> <b>bracket</b> (default)</td>
+
+<td ALIGN=CENTER>X'AD'</td>
+
+<td>
+<center>X'BD'</center>
+</td>
+
+<td>
+<center><b>[</b></center>
+</td>
+
+<td>
+<center><b>]</b></center>
+</td>
+
+<td>
+<center><b>Ý</b></center>
+</td>
+
+<td>
+<center><b>¨</b></center>
+</td>
+
+<td ROWSPAN="3">
+<center><img SRC="del.jpg" height=23 width=24></center>
+</td>
+
+<td ROWSPAN="3">
+<center><img SRC="delta.jpg" height=21 width=20></center>
+</td>
+
+<td ROWSPAN="3">
+<center><b>[</b></center>
+</td>
+
+<td ROWSPAN="3">
+<center><b>]</b></center>
+</td>
+</tr>
+
+<tr>
+<td><b>-charset</b> <b>us</b></td>
+
+<td>
+<center>X'BA'</center>
+</td>
+
+<td>
+<center>X'BB'</center>
+</td>
+
+<td ROWSPAN="2">
+<center><b>Ý</b></center>
+</td>
+
+<td ROWSPAN="2">
+<center><b>¨</b></center>
+</td>
+
+<td ROWSPAN="2">
+<center><b>[</b></center>
+</td>
+
+<td ROWSPAN="2">
+<center><b>]</b></center>
+</td>
+</tr>
+
+<tr>
+<td><b>-apl</b></td>
+
+<td>
+<center>GE X'AD'</center>
+</td>
+
+<td>
+<center>GE X'BD'</center>
+</td>
+</tr>
+</table></center>
+
+</body>
+</html>
--- NEW FILE x3270.desktop ---
[Desktop Entry]
Name=x3270
Type=Application
Comment=3270 terminal emulator
Exec=x3270
Icon=x3270.png
Index: x3270.spec
===================================================================
RCS file: /cvs/extras/rpms/x3270/devel/x3270.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- x3270.spec 18 Apr 2005 11:29:46 -0000 1.2
+++ x3270.spec 20 Apr 2005 10:53:57 -0000 1.3
@@ -5,18 +5,20 @@
Summary: An X Window System based IBM 3278/3279 terminal emulator
Name: x3270
Version: 3.3.4
-Release: 1
+Release: 2
License: MIT
Group: Applications/Internet
URL: http://www.geocities.com/SiliconValley/Peaks/7814
Source0: http://x3270.bgp.nu/download/x3270-334.tgz
Source1: http://x3270.bgp.nu/download/c3270-334.tgz
Source2: x3270.png
+Source3: x3270.desktop
Patch0: x3270-3.2.16-redhat.patch
Patch1: x3270-3.2.20-timeh.patch
Patch2: x3270-3.2-segfault.patch
Patch3: c3270-332-ncursesw.patch
Patch4: x3270-3.3-syntax.patch
+Patch5: x3270-3.3-encoding.patch
Prereq: %{_prefix}/X11R6/bin/mkfontdir
BuildPreReq: ncurses-devel readline-devel glibc-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -27,14 +29,14 @@
Obsoletes: x3270-tcl
%package x11
-Summary: IBM 3278/3279 terminal emulator for the X Window System.
+Summary: IBM 3278/3279 terminal emulator for the X Window System
Group: Applications/Internet
BuildRequires: xorg-x11-devel
Requires: %{name} = %{version}
Prereq: gtk2 >= 2.6
%package text
-Summary: IBM 3278/3279 terminal emulator for text mode.
+Summary: IBM 3278/3279 terminal emulator for text mode
Group: Applications/Internet
Requires: %{name} = %{version}
@@ -43,8 +45,7 @@
terminals, commonly used with mainframe applications.
You will also need to install a frontend for %{name}. Available frontends
-are %{name}-x11 (for the X Window System), %{name}-text (for text mode) and
-%{name}-tcl (for Tcl scripting).
+are %{name}-x11 (for the X Window System) and %{name}-text (for text mode).
%description x11
The x3270 program opens a window in the X Window System which emulates
@@ -65,29 +66,30 @@
%prep
%setup -q -n x3270-3.3 -a 1
-%patch0 -p1 -b .rh
-%patch1 -p1 -b .timeh
-%patch2 -p1 -b .seg1
-%patch3 -p1 -b .ncursesw
-%patch4 -p1 -b .syntax
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
%build
-export PATH=$PATH:/usr/X11R6/bin
+export PATH=$PATH:%{_prefix}/X11R6/bin
export CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS"
# Set LIBX3270DIR to something we can share with x3270-text
perl -pi -e "s,LIBX3270DIR =.*,LIBX3270DIR = /usr/lib/x3270,g" Imakefile.in
libtoolize --copy --force
-%configure --enable-app-defaults --prefix=/usr/X11R6
+%configure --enable-app-defaults --prefix=%{_prefix}/X11R6
xmkmf -a
make %{?_smp_mflags}
cd c3270-3.3
autoconf
libtoolize --copy --force
-%configure --prefix=/usr
+%configure --prefix=%{_prefix}
make %{?_smp_mflags}
%install
-export PATH=$PATH:/usr/X11R6/bin
+export PATH=$PATH:%{_prefix}/X11R6/bin
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_prefix}/bin
mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/x3270
@@ -96,7 +98,7 @@
mkdir -p ${RPM_BUILD_ROOT}%{_prefix}/X11R6/man/man1
mkdir -p ${RPM_BUILD_ROOT}%{_prefix}/X11R6/lib/X11/fonts/misc
mkdir -p ${RPM_BUILD_ROOT}%{_prefix}/X11R6/lib/X11/app-defaults
-mkdir -p ${RPM_BUILD_ROOT}/usr/share/icons/hicolor/48x48/apps
+mkdir -p ${RPM_BUILD_ROOT}/%{_datadir}/icons/hicolor/48x48/apps
# XXX Hack around mkfontdir madness on install.
install -m755 x3270 $RPM_BUILD_ROOT%{_prefix}/X11R6/bin
@@ -119,23 +121,14 @@
cd ..
install -m644 X3270.xad ${RPM_BUILD_ROOT}%{_prefix}/X11R6/lib/X11/app-defaults/X3270
+install -m644 %{SOURCE2} ${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/48x48/apps
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/applnk/Utilities
+install -m644 %{SOURCE3} ${RPM_BUILD_ROOT}%{_sysconfdir}/X11/applnk/Utilities
-install -m644 %{SOURCE2} ${RPM_BUILD_ROOT}/usr/share/icons/hicolor/48x48/apps
-( cd $RPM_BUILD_ROOT
- mkdir -p .%{_sysconfdir}/X11/applnk/Utilities
- cat > .%{_sysconfdir}/X11/applnk/Utilities/x3270.desktop <<EOF
-[Desktop Entry]
-Name=x3270
-Type=Application
-Comment=3270 terminal emulator
-Exec=x3270
-Icon=x3270.png
-EOF
-)
%if %{desktop_file}
-mkdir -p $RPM_BUILD_ROOT/usr/share/applications
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications
desktop-file-install --vendor net \
- --dir $RPM_BUILD_ROOT/usr/share/applications \
+ --dir $RPM_BUILD_ROOT/%{_datadir}/applications \
--add-category "Application;System;X-Red-Hat-Extra" \
$RPM_BUILD_ROOT%{_sysconfdir}/X11/applnk/Utilities/x3270.desktop
@@ -150,8 +143,8 @@
rm -f Examples/*.rh
chmod -x Examples/*
for i in pr3287 x3270if; do
- mv $RPM_BUILD_ROOT/usr/X11R6/bin/$i $RPM_BUILD_ROOT/usr/bin
- ln -s ../../bin/$i $RPM_BUILD_ROOT/usr/X11R6/bin
+ mv $RPM_BUILD_ROOT/%{_prefix}/X11R6/bin/$i $RPM_BUILD_ROOT/%{_prefix}/bin
+ ln -s ../../bin/$i $RPM_BUILD_ROOT/%{_prefix}/X11R6/bin
done
%clean
@@ -190,9 +183,9 @@
%{_prefix}/X11R6/bin/x3270if
%{_prefix}/X11R6/lib/X11/fonts/misc/3270*
%{_prefix}/X11R6/man/man1/*
-%{_prefix}/share/icons/hicolor/48x48/apps/x3270.png
+%{_datadir}/icons/hicolor/48x48/apps/x3270.png
%if %{desktop_file}
-/usr/share/applications/*
+%{_datadir}/applications/*
%else
%config(missingok) %{_sysconfdir}/X11/applnk/Utilities/*
%endif
@@ -204,6 +197,10 @@
%{_mandir}/man1/c3270*
%changelog
+* Wed Apr 20 2005 Karsten Hopp <karsten at redhat.de> 3.3.4-2
+- spec file cleanups from Chris Ricker <kaboom at oobleck.net>
+- remove backup files from rpm patch process
+
* Mon Apr 18 2005 Karsten Hopp <karsten at redhat.de> 3.3.4-1
- rpmlint fix
- buildroot fix
- Previous message (by thread): rpms/gnome-theme-clearlooks/FC-3 .cvsignore, 1.2, 1.3 gnome-theme-clearlooks.spec, 1.1, 1.2 sources, 1.2, 1.3
- Next message (by thread): rpms/x3270/devel x3270-3.3-encoding.patch, NONE, 1.1 x3270.desktop, NONE, 1.1 x3270.spec, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list