From 736f8bad147e3a5be58cbc32f428189f04b60276 Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Wed, 20 Apr 2005 10:53:57 +0000 Subject: [PATCH] - spec file cleanups from Chris Ricker - remove backup files from rpm patch process --- x3270-3.3-encoding.patch | 398 +++++++++++++++++++++++++++++++++++++++ x3270.desktop | 7 + x3270.spec | 63 +++---- 3 files changed, 435 insertions(+), 33 deletions(-) create mode 100644 x3270-3.3-encoding.patch create mode 100644 x3270.desktop diff --git a/x3270-3.3-encoding.patch b/x3270-3.3-encoding.patch new file mode 100644 index 0000000..b1d5e01 --- /dev/null +++ b/x3270-3.3-encoding.patch @@ -0,0 +1,398 @@ +--- 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 @@ +- +- +- +- +- +- +- Square Bracket Characters ++ ++ ++ ++ ++ ++ ++ Square Bracket Characters + +- +- +- +-

+-Square Bracket Characters

+- +-

+-The Problem

+-Most IBM 3270 emulators have some degree of difficulty with the square-bracket +-characters, [ and ]. 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 Chararcter +-Set Reference 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  and , +-or Ý and ¨. +-

+-Host Configuration

+-If you are using ISPF, you may simply need to use the correct terminal +-translation table. According to the IBM's ISPF Planning and Customizing +-(SC28-1298), Section 3.11, the correct translation table for displaying +-square bracket characters is called 3278A. +-

In VM/CMS, the commands terminal apl on and set apl on +-cause the X'AD', X'BD', X'BA' and X'BB' characters to be displayed with +-a Graphics Escape (GE) prefix. With terminal apl off and set +-apl off in effect, they are displayed without the GE prefix. +-

+-x3270 Facilities

+-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. +-
-charset bracket 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.
+- +-
-charset us is for use with hosts that use X'BA' and +-X'BB' for the square-bracket characters, and do not display these +-characters with a GE sequence.
+- +-
-apl (an abbreviation for -charset apl, -keymap +-apl) 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.
+-Here is a table which summarizes the combinations of characters generated +-and displayed in the various modes. +-
  +-
+- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-
  +-
keyboard generates
+-		 +-
graphic displayed for EBCDIC codes
+-
x3270 Mode +-
[ key
+-		 +-
] key
+-		 +-
X'AD'
+-		 +-
X'BD'
+-		 +-
X'BA'
+-		 +-
X'BB'
+-		 +-
GE X'BA'
+-		 +-
GE X'BB'
+-		 +-
GE X'AD'
+-		 +-
GE X'BD'
+-
-charset bracket (default)X'AD' +-
X'BD'
+-		 +-
[
+-		 +-
]
+-		 +-
Ý
+-		 +-
¨
+-		 +-
+-		 +-
+-		 +-
[
+-		 +-
]
+-
-charset us +-
X'BA'
+-		 +-
X'BB'
+-		 +-
Ý
+-		 +-
¨
+-		 +-
[
+-		 +-
]
+-
-apl +-
GE X'AD'
+-		 +-
GE X'BD'
+-
+- +- +- ++ ++ ++ ++

++Square Bracket Characters

++ ++

++The Problem

++Most IBM 3270 emulators have some degree of difficulty with the square-bracket ++characters, [ and ]. 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 Character ++Set Reference 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  and , ++or Ý and ¨. ++

++Host Configuration

++If you are using ISPF, you may simply need to use the correct terminal ++translation table. According to the IBM's ISPF Planning and Customizing ++(SC28-1298), Section 3.11, the correct translation table for displaying ++square bracket characters is called 3278A. ++

In VM/CMS, the commands terminal apl on and set apl on ++cause the X'AD', X'BD', X'BA' and X'BB' characters to be displayed with ++a Graphics Escape (GE) prefix. With terminal apl off and set ++apl off in effect, they are displayed without the GE prefix. ++

++x3270 Facilities

++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. ++
-charset bracket 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.
++ ++
-charset us is for use with hosts that use X'BA' and ++X'BB' for the square-bracket characters, and do not display these ++characters with a GE sequence.
++ ++
-apl (an abbreviation for -charset apl, -keymap ++apl) 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.
++Here is a table which summarizes the combinations of characters generated ++and displayed in the various modes. ++
  ++
++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++
  ++
keyboard generates
++		 ++
graphic displayed for EBCDIC codes
++
x3270 Mode ++
[ key
++		 ++
] key
++		 ++
X'AD'
++		 ++
X'BD'
++		 ++
X'BA'
++		 ++
X'BB'
++		 ++
GE X'BA'
++		 ++
GE X'BB'
++		 ++
GE X'AD'
++		 ++
GE X'BD'
++
-charset bracket (default)X'AD' ++
X'BD'
++		 ++
[
++		 ++
]
++		 ++
Ý
++		 ++
¨
++		 ++
++		 ++
++		 ++
[
++		 ++
]
++
-charset us ++
X'BA'
++		 ++
X'BB'
++		 ++
Ý
++		 ++
¨
++		 ++
[
++		 ++
]
++
-apl ++
GE X'AD'
++		 ++
GE X'BD'
++
++ ++ ++ diff --git a/x3270.desktop b/x3270.desktop new file mode 100644 index 0000000..0f02511 --- /dev/null +++ b/x3270.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Name=x3270 +Type=Application +Comment=3270 terminal emulator +Exec=x3270 +Icon=x3270.png + diff --git a/x3270.spec b/x3270.spec index b72a4ab..e4a7d64 100644 --- a/x3270.spec +++ b/x3270.spec @@ -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 @@ BuildPrereq: desktop-file-utils >= %{desktop_file_utils_version} 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 @@ The x3270 package contains files needed for emulating the IBM 3278/3279 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 @@ Install the %{name}-text package if you need to access IBM hosts using an IBM %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/bin 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 @@ done 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 < 3.3.4-2 +- spec file cleanups from Chris Ricker +- remove backup files from rpm patch process + * Mon Apr 18 2005 Karsten Hopp 3.3.4-1 - rpmlint fix - buildroot fix