rpms/x3270/devel c3270-332-ncursesw.patch, NONE, 1.1 x3270-3.2-segfault.patch, NONE, 1.1 x3270-3.2.16-redhat.patch, NONE, 1.1 x3270-3.2.20-timeh.patch, NONE, 1.1 x3270-3.3-syntax.patch, NONE, 1.1 x3270.png, NONE, 1.1 x3270.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Karsten Hopp (karsten)
fedora-extras-commits at redhat.com
Mon Apr 18 11:07:35 UTC 2005
Author: karsten
Update of /cvs/extras/rpms/x3270/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27643/devel
Modified Files:
.cvsignore sources
Added Files:
c3270-332-ncursesw.patch x3270-3.2-segfault.patch
x3270-3.2.16-redhat.patch x3270-3.2.20-timeh.patch
x3270-3.3-syntax.patch x3270.png x3270.spec
Log Message:
auto-import x3270-3.3.4-1 on branch devel from x3270-3.3.4-1.src.rpm
c3270-332-ncursesw.patch:
--- NEW FILE c3270-332-ncursesw.patch ---
--- x3270-3.3/c3270-3.3/configure.in.ncursesw 2003-12-03 11:45:50.000000000 +0100
+++ x3270-3.3/c3270-3.3/configure.in 2003-12-03 11:47:58.000000000 +0100
@@ -60,7 +60,7 @@
dnl Note that the order here is important. The last libraries should appear
dnl first, so that objects in them can be used by subsequent libraries.
AC_CHECK_LIB(util, forkpty)
-AC_CHECK_LIB(ncurses, newterm, , [AC_CHECK_LIB(curses, newterm, , [AC_MSG_ERROR(Can't find libncurses or new-enough libcurses)])])
+AC_CHECK_LIB(ncursesw, newterm, , [ AC_CHECK_LIB(ncurses, newterm, , [AC_CHECK_LIB(curses, newterm, , [AC_MSG_ERROR(Can't find libncurses or new-enough libcurses)])])])
if test "$with_readline" != no; then
AC_CHECK_LIB(readline, rl_initialize)
fi
x3270-3.2-segfault.patch:
--- NEW FILE x3270-3.2-segfault.patch ---
--- x3270-3.2/host.c.seg1 2003-07-09 11:22:45.000000000 +0200
+++ x3270-3.2/host.c 2003-07-09 11:23:04.000000000 +0200
@@ -784,8 +784,8 @@
(void) fprintf(lcf, "%lu %s\n", h->connect_time,
h->name);
}
+ fclose(lcf);
}
- fclose(lcf);
Free(lcf_name);
}
}
x3270-3.2.16-redhat.patch:
--- NEW FILE x3270-3.2.16-redhat.patch ---
--- x3270-3.2/Examples/cms_logon.bash.rh Sun Sep 3 05:09:37 2000
+++ x3270-3.2/Examples/cms_logon.bash Fri Dec 22 14:44:02 2000
@@ -1,4 +1,4 @@
-#! /usr/local/bin/bash
+#!/bin/bash
# Copyright 1995, 2000 by Paul Mattes.
# Permission to use, copy, modify, and distribute this software and its
--- x3270-3.2/Examples/peer_script.expect.rh Mon Sep 29 20:30:30 1997
+++ x3270-3.2/Examples/peer_script.expect Fri Dec 22 14:44:02 2000
@@ -1,4 +1,4 @@
-#! /usr/local/bin/expect
+#!/usr/bin/expect
# TSO login script, which runs as a peer of x3270.
# expect version
x3270-3.2.20-timeh.patch:
--- NEW FILE x3270-3.2.20-timeh.patch ---
--- 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 <ctype.h> /* Character classes */
#include <string.h> /* String manipulations */
#include <sys/types.h> /* Basic system data types */
-#include <sys/time.h> /* System time-related data types */
#include <time.h> /* C library time functions */
#include "localdefs.h" /* {s,tcl,c}3270-specific defines */
x3270-3.3-syntax.patch:
--- NEW FILE x3270-3.3-syntax.patch ---
diff -urN x3270-3.3/3270ds.h x3270-3.3_new/3270ds.h
--- x3270-3.3/3270ds.h 2004-07-05 21:22:04.000000000 +0200
+++ x3270-3.3_new/3270ds.h 2005-01-13 11:58:38.716890528 +0100
@@ -285,8 +285,10 @@
#define MINUS1 0xffffffffU
#define SET16(ptr, val) { \
- *((ptr)++) = ((val) & MASK16) >> 8; \
- *((ptr)++) = ((val) & MASK08); \
+ *(ptr) = ((val) & MASK16) >> 8; \
+ (ptr)++; \
+ *(ptr) = ((val) & MASK08); \
+ (ptr)++; \
}
#define GET16(val, ptr) { \
(val) = *((ptr)+1); \
diff -urN x3270-3.3/qcpp.c x3270-3.3_new/qcpp.c
--- x3270-3.3/qcpp.c 2002-12-05 00:34:18.000000000 +0100
+++ x3270-3.3_new/qcpp.c 2005-01-13 11:59:28.924631795 +0100
@@ -44,7 +44,7 @@
{
int c;
char buf[1024];
- FILE *f, *t, *o;
+ FILE *f = 0, *t, *o;
int nest = 0;
int ln = 0;
int pass[MAX_NEST];
--- NEW FILE x3270.spec ---
%define desktop_file 1
%if %{desktop_file}
%define desktop_file_utils_version 0.2.93
%endif
Summary: An X Window System based IBM 3278/3279 terminal emulator.
Name: x3270
Version: 3.3.4
Release: 1
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
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
Prereq: %{_prefix}/X11R6/bin/mkfontdir
BuildPreReq: ncurses-devel readline-devel glibc-devel
BuildRoot: %{_tmppath}/%{name}-root
%if %{desktop_file}
Requires: /usr/bin/desktop-file-install
BuildPrereq: desktop-file-utils >= %{desktop_file_utils_version}
%endif
Obsoletes: x3270-tcl
%package x11
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.
Group: Applications/Internet
Requires: %{name} = %{version}
%description
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).
%description x11
The x3270 program opens a window in the X Window System which emulates
the actual look of an IBM 3278/3279 terminal, commonly used with
mainframe applications. x3270 also allows you to telnet to an IBM
host from the x3270 window.
Install the %{name}-x11 package if you need to access IBM hosts using an IBM
3278/3279 terminal emulator from X11.
%description text
The c3270 program opens a 3270 terminal which emulates the actual look of an
IBM 3278/3279 terminal, commonly used with mainframe applications.
x3270 also allows you to telnet to an IBM host from the x3270 window.
Install the %{name}-text package if you need to access IBM hosts using an IBM
3278/3279 terminal emulator without running X.
%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
%build
export PATH=$PATH:/usr/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
xmkmf -a
make
cd c3270-3.3
autoconf
libtoolize --copy --force
%configure --prefix=/usr
make
%install
export PATH=$PATH:/usr/X11R6/bin
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_prefix}/bin
mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/x3270
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
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
# XXX Hack around mkfontdir madness on install.
install -m755 x3270 $RPM_BUILD_ROOT%{_prefix}/X11R6/bin
install -m755 x3270if $RPM_BUILD_ROOT%{_prefix}/X11R6/bin
install -m644 *pcf.gz $RPM_BUILD_ROOT%{_prefix}/X11R6/lib/X11/fonts/misc
install -m644 X3270.ad $RPM_BUILD_ROOT%{_prefix}/X11R6/lib/X11/app-defaults/X3270
install -m644 ibm_hosts $RPM_BUILD_ROOT%{_prefix}/lib/x3270
for i in x3270 x3270if x3270-script ibm_hosts; do
install -m644 $i.man $RPM_BUILD_ROOT%{_prefix}/X11R6/man/man1/$i.1x
done
install -m755 pr3287/pr3287 $RPM_BUILD_ROOT%{_prefix}/X11R6/bin
install -m644 pr3287/pr3287.man $RPM_BUILD_ROOT%{_prefix}/X11R6/man/man1/pr3287.1x
cd c3270-3.3
install -m755 c3270 $RPM_BUILD_ROOT%{_prefix}/bin
install -m755 x3270if $RPM_BUILD_ROOT%{_prefix}/bin
install -m755 pr3287/pr3287 $RPM_BUILD_ROOT%{_prefix}/bin
for i in c3270 x3270if x3270-script ibm_hosts; do
install -m644 $i.man $RPM_BUILD_ROOT%{_mandir}/man1/$i.1
done
cd ..
install -m644 X3270.xad ${RPM_BUILD_ROOT}%{_prefix}/X11R6/lib/X11/app-defaults/X3270
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
desktop-file-install --vendor net \
--dir $RPM_BUILD_ROOT/usr/share/applications \
--add-category "Application;System;X-Red-Hat-Extra" \
$RPM_BUILD_ROOT%{_sysconfdir}/X11/applnk/Utilities/x3270.desktop
# remove x3270.desktop from the buildroot now that we're done with
# it, as a matter of fact remove all of %{_sysconfdir} since we don't
# have anything there
rm -rf $RPM_BUILD_ROOT%{_sysconfdir}
%endif
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
done
%clean
rm -rf $RPM_BUILD_ROOT
%post x11
cd %{_prefix}/X11R6/lib/X11/fonts/misc && %{_prefix}/X11R6/bin/mkfontdir
touch --no-create %{_datadir}/icons/hicolor
if [ -x /usr/bin/gtk-update-icon-cache ]; then
gtk-update-icon-cache %{_datadir}/icons/hicolor
fi
%postun x11
if [ "$1" = "0" ]; then
cd %{_prefix}/X11R6/lib/X11/fonts/misc && %{_prefix}/X11R6/bin/mkfontdir
fi
touch --no-create %{_datadir}/icons/hicolor
if [ -x /usr/bin/gtk-update-icon-cache ]; then
gtk-update-icon-cache %{_datadir}/icons/hicolor
fi
%files
%defattr(-,root,root)
%doc README Examples html LICENSE
%{_prefix}/bin/pr3287
%{_prefix}/bin/x3270if
%{_mandir}/man1/ibm_hosts*
%{_mandir}/man1/x32*
%dir %{_prefix}/lib/x3270
%config(noreplace) %{_prefix}/lib/x3270/ibm_hosts
%files x11
%defattr(-,root,root)
%{_prefix}/X11R6/bin/x3270
%{_prefix}/X11R6/bin/pr3287
%{_prefix}/X11R6/bin/x3270if
%{_prefix}/X11R6/lib/X11/fonts/misc/3270*
%{_prefix}/X11R6/man/man1/*
%{_prefix}/share/icons/hicolor/48x48/apps/x3270.png
%if %{desktop_file}
/usr/share/applications/*
%else
%config(missingok) %{_sysconfdir}/X11/applnk/Utilities/*
%endif
%config %{_prefix}/X11R6/lib/X11/app-defaults/X3270
%files text
%defattr(-,root,root)
%{_prefix}/bin/c3270
%{_mandir}/man1/c3270*
%changelog
* Tue Apr 12 2005 Karsten Hopp <karsten at redhat.de> 3.3.4-1
- Version 3.3.4, fixes mouse selection and timing problems with scripted
logins in ~/.ibm_hosts
* Mon Mar 28 2005 Christopher Aillon <caillon at redhat.com>
- rebuilt
* Fri Mar 25 2005 Christopher Aillon <caillon at redhat.com> 3.3.3.b2-2
- Update the GTK+ theme icon cache on (un)install
* Tue Mar 08 2005 Karsten Hopp <karsten at redhat.de> 3.3.3.b2-1
- update to b2, which fixes a segfault when login is done with
an entry in .ibm_hosts (via emulate_input)
* Wed Mar 02 2005 Karsten Hopp <karsten at redhat.de> 3.3.3.b1-2
- build with gcc-4
* Thu Jan 13 2005 Karsten Hopp <karsten at redhat.de> 3.3.3.b1-1
- update to fix ibm_hosts file parsing and c3270 color support
* Wed Jan 12 2005 Tim Waugh <twaugh at redhat.com> 3.3.2.p1-10
- Rebuilt for new readline.
* Wed Dec 08 2004 Karsten Hopp <karsten at redhat.de> 3.3.2.p1-9
- add icon (#141599, #125577)
- fix variable usage (local variable overwrite) (#116660)
* Wed Dec 08 2004 Karsten Hopp <karsten at redhat.de> 3.3.2.p1-8
- rebuild
* Thu Oct 21 2004 Karsten Hopp <karsten at redhat.de> 3.3.2.p1-7
- enable builds on ppc(64) again (#136703)
* Wed Jul 07 2004 Karsten Hopp <karsten at redhat.de> 3.3.2.p1-6
- rebuild with new gcc
* Mon Jul 05 2004 Karsten Hopp <karsten at redhat.de> 3.3.2.p1-5
- update c3270 package to patchlevel2
- fix buildrequires (#124280)
- fix compiler warnings (#106312, #78479)
* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt
* Tue Feb 17 2004 Karsten Hopp <karsten at redhat.de> 3.3.2.p1-3
- include license file
* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt
* Thu Jan 15 2004 Karsten Hopp <karsten at redhat.de> 3.3.2.p1-1
- update to 3.3.2.p1
* Wed Dec 03 2003 Karsten Hopp <karsten at redhat.de> 3.3.2-1
- update to latest stable release, now with SSL and DBCS support
* Tue Aug 12 2003 Karsten Hopp <karsten at redhat.de> 3.2.20-4.2
- check for libncursesw and use it if available
* Wed Jul 09 2003 Karsten Hopp <karsten at redhat.de> 3.2.20-4.1
- rebuilt
* Wed Jul 09 2003 Karsten Hopp <karsten at redhat.de> 3.2.20-4
- fix segfault when ~/.x3270connect isn't writable by the user
* Tue Jun 17 2003 Karsten Hopp <karsten at redhat.de> 3.2.20-3.1
- rebuilt
* Tue Jun 17 2003 Karsten Hopp <karsten at redhat.de> 3.2.20-3
- rebuild
* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
- rebuilt
* Mon May 05 2003 Karsten Hopp <karsten at redhat.de> 3.2.20-1
- update to 3.2.20
* Tue Apr 1 2003 Thomas Woerner <twoerner at redhat.com>
- fixed inclusion of time header file (sys/time.h -> time.h)
* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
- rebuilt
* Tue Nov 19 2002 Karsten Hopp <karsten at redhat.de> 3.2.19-3
- update to patchlevel 4:
Re-enable the automatic font switching when the
x3270 window is resized
* Tue Nov 19 2002 Tim Powers <timp at redhat.com>
- rebuild for all arches
- remove cruft from the buildroot we aren't shipping
* Wed Jul 24 2002 Karsten Hopp <karsten at redhat.de>
- 3.2.19
- use desktop-file-utils
* Fri Jun 21 2002 Tim Powers <timp at redhat.com>
- automated rebuild
* Thu May 23 2002 Tim Powers <timp at redhat.com>
- automated rebuild
* Mon Mar 4 2002 Bernhard Rosenkraenzer <bero at redhat.com> 3.2.18-2
- Update to 3.2.18 patchlevel 14
* Wed Jan 16 2002 Bernhard Rosenkraenzer <bero at redhat.com> 3.2.18-1
- 3.2.18
- Don't ship x3270-tcl anymore
* Mon Jul 16 2001 Bernhard Rosenkraenzer <bero at redhat.com> 3.2.16-4
- Add build dependencies (#48930)
* Sat Jun 09 2001 Florian La Roche <Florian.LaRoche at redhat.de>
- remove all provides/requires for x3270-frontend
* Sun May 13 2001 Bernhard Rosenkraenzer <bero at redhat.com> 3.2.16-2
- Rebuild with new readline
* Thu May 10 2001 Bernhard Rosenkraenzer <bero at redhat.com> 3.2.16-1
- 3.2.16
- adapt patches
- get rid of the **** pdksh requirement
- split the tcl version into a different package, no need to require tcl for
normal use
- split the x11 frontend into a separate package.
We don't necessarily have X on a machine where we want to run
3270 sessions (e.g. s390...)
* Fri Dec 22 2000 Bernhard Rosenkraenzer <bero at redhat.com>
- 3.2.14
- Add c3270 (textmode x3270) in x3270-text package
- Fix build
- Make ibm_hosts a %config(noreplace)
* Tue Oct 24 2000 Jeff Johnson <jbj at redhat.com>
- remove /usr/local paths in Examples.
* Sun Oct 22 2000 Jeff Johnson <jbj at redhat.com>
- update to 3.2.13.
* Thu Jul 13 2000 Prospector <bugzilla at redhat.com>
- automatic rebuild
* Fri Jun 2 2000 Jeff Johnson <jbj at redhat.com>
- rebuild for 7.0
* Mon Feb 07 2000 Preston Brown <pbrown at redhat.com>
- wmconfig -> desktop
* Mon Feb 7 2000 Jeff Johnson <jbj at redhat.com>
- compress man pages.
* Fri Jan 14 2000 Jeff Johnson <jbj at redhat.com>
- update to 3.1.1.9 (see URL for pending 3.2alpha version).
* Fri Sep 24 1999 Preston Brown <pbrown at redhat.com>
- change to directory before doing a mkfontdir
* Sun Mar 21 1999 Cristian Gafton <gafton at redhat.com>
- auto rebuild in the new build environment (release 7)
* Tue Jan 12 1999 Jeff Johnson <jbj at redhat.com>
- ibm_hosts needed %config (#788)
* Fri Aug 7 1998 Jeff Johnson <jbj at redhat.com>
- build root
* Fri May 01 1998 Prospector System <bugs at redhat.com>
- translations modified for de, fr, tr
* Wed Oct 22 1997 Marc Ewing <marc at redhat.com>
- new version
- added wmconfig entry
* Mon Jul 21 1997 Erik Troan <ewt at redhat.com>
- built against glibc
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/x3270/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 18 Apr 2005 11:06:22 -0000 1.1
+++ .cvsignore 18 Apr 2005 11:07:33 -0000 1.2
@@ -0,0 +1,2 @@
+c3270-334.tgz
+x3270-334.tgz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/x3270/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 18 Apr 2005 11:06:22 -0000 1.1
+++ sources 18 Apr 2005 11:07:33 -0000 1.2
@@ -0,0 +1,2 @@
+5b65f5e0e052eafc5f84c713fff89175 c3270-334.tgz
+3917a11a3cbba8490bf014303a3c9076 x3270-334.tgz
More information about the fedora-extras-commits
mailing list