diff --git a/.cvsignore b/.cvsignore index 93a1add..9d06fdc 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -c3270-3.3.4p7.tgz -x3270-3.3.4p7.tgz +c3270-3.3.6.tgz +x3270-3.3.6.tgz diff --git a/sources b/sources index e1981cb..e3c49fe 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -3ee50cfc7ad1f29ca34f7e10968a6127 c3270-3.3.4p7.tgz -cf996a476f6daa2eed337449c900ee58 x3270-3.3.4p7.tgz +d3eb409c406e0ff5ed9a3f0ae4b5452e c3270-3.3.6.tgz +3017011d1c33bb18a609b06379bf6ba6 x3270-3.3.6.tgz diff --git a/x3270-3.2.20-timeh.patch b/x3270-3.2.20-timeh.patch deleted file mode 100644 index 3e6b856..0000000 --- a/x3270-3.2.20-timeh.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- x3270-3.2/globals.h.timeh 2003-05-05 16:43:43.000000000 +0200 -+++ x3270-3.2/globals.h 2003-05-05 16:43:54.000000000 +0200 -@@ -67,7 +67,6 @@ - #include /* Character classes */ - #include /* String manipulations */ - #include /* Basic system data types */ --#include /* System time-related data types */ - #include /* C library time functions */ - #include "localdefs.h" /* {s,tcl,c}3270-specific defines */ - diff --git a/x3270-3.3.6-resize.patch b/x3270-3.3.6-resize.patch new file mode 100644 index 0000000..f83d49d --- /dev/null +++ b/x3270-3.3.6-resize.patch @@ -0,0 +1,10 @@ +--- x3270-3.3/screen.c.old 2007-07-18 08:58:54.000000000 +0100 ++++ x3270-3.3/screen.c 2007-07-18 08:59:07.000000000 +0100 +@@ -5072,7 +5072,6 @@ + trace_event(" bigger\n asserting desired size\n"); + set_toplevel_sizes(); + screen_redo = REDO_NONE; +- goto done; + } + + /* They're not correct. */ diff --git a/x3270.spec b/x3270.spec index 3fe9caf..eaa8ec4 100644 --- a/x3270.spec +++ b/x3270.spec @@ -4,8 +4,8 @@ %endif Summary: An X Window System based IBM 3278/3279 terminal emulator Name: x3270 -Version: 3.3.4p7 -Release: 5%{?dist} +Version: 3.3.6 +Release: 1%{?dist} License: MIT Group: Applications/Internet URL: http://www.geocities.com/SiliconValley/Peaks/7814 @@ -13,20 +13,19 @@ Source0: http://x3270.bgp.nu/download/x3270-%{version}.tgz Source1: http://x3270.bgp.nu/download/c3270-%{version}.tgz Source2: x3270.png Source3: x3270.desktop -Patch0: x3270-3.3.4-path.patch -Patch1: x3270-3.2.20-timeh.patch -Patch2: c3270-332-ncursesw.patch -Patch3: x3270-3.3-syntax.patch -Patch4: x3270-3.3-encoding.patch -Patch5: x3270-3.3-modularX.patch -Requires: xorg-x11-font-utils +Patch0: x3270-3.2.16-redhat.patch +Patch1: c3270-332-ncursesw.patch +Patch2: x3270-3.3-syntax.patch +Patch3: x3270-3.3-encoding.patch +Patch4: x3270-3.3.6-resize.patch +Prereq: xorg-x11-font-utils +BuildPreReq: ncurses-devel readline-devel glibc-devel openssl-devel BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel readline-devel glibc-devel openssl-devel libtool BuildRequires: perl %if %{desktop_file} BuildRequires: desktop-file-utils >= %{desktop_file_utils_version} %endif -Obsoletes: x3270-tcl %package x11 Summary: IBM 3278/3279 terminal emulator for the X Window System @@ -74,7 +73,7 @@ Install the %{name}-text package if you need to access IBM hosts using an IBM %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 +#patch3 -p1 %patch4 -p1 %build @@ -84,7 +83,7 @@ perl -pi -e "s,LIBX3270DIR =.*,LIBX3270DIR = %{_datadir}/x3270,g" Imakefile.in # Fix end of line encodings perl -pi -e "s/ //" html/Keymap.html html/Build.html libtoolize --copy --force -%configure --prefix=%{_prefix}/ --with-fontdir=%{_datadir}/x3270/fonts --x-includes=%{_includedir}/X11 --x-libraries=%{_libdir}/X11 +%configure --prefix=%{_prefix}/ --with-fontdir=%{_datadir}/fonts/x3270 --x-includes=/usr/include/X11 --x-libraries=/%{_libdir}/X11 --enable-app-defaults # Work around broken imake: echo 'makedepend "$@"' > gccmakedep chmod +x gccmakedep @@ -110,6 +109,7 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/x3270 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/x3270/fonts mkdir -p ${RPM_BUILD_ROOT}/%{_datadir}/icons/hicolor/48x48/apps +mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/X11/app-defaults # XXX Hack around mkfontdir madness on install. install -m755 x3270 $RPM_BUILD_ROOT%{_prefix}/bin @@ -128,6 +128,7 @@ cd .. 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 X3270.xad ${RPM_BUILD_ROOT}%{_datadir}/X11/app-defaults/X3270 %if %{desktop_file} mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications @@ -141,8 +142,8 @@ rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/X11 %endif -rm -f Examples/*.rh -chmod -x Examples/* +rm -f Examples/*.rh Examples/*.orig +chmod -x Examples/* html/* %clean rm -rf $RPM_BUILD_ROOT @@ -167,7 +168,7 @@ fi %files %defattr(-,root,root) -%doc README Examples html LICENSE +%doc README LICENSE Examples html %{_prefix}/bin/pr3287 %{_prefix}/bin/x3270if %exclude %{_mandir}/man1/c3270* @@ -181,6 +182,7 @@ fi %dir %{_datadir}/x3270/fonts %{_datadir}/x3270/fonts/* %{_datadir}/icons/hicolor/48x48/apps/x3270.png +%{_datadir}/X11/app-defaults/X3270 %if %{desktop_file} %{_datadir}/applications/* %else @@ -193,6 +195,11 @@ fi %{_mandir}/man1/c3270* %changelog +* Wed Aug 08 2007 Karsten Hopp 3.3.6-1 +- version 3.3.6 +- fix font resize issue +- enable app-defaults + * Sun Aug 27 2006 Karsten Hopp 3.3.4p7-5 - rebuild