rpms/x3270/devel x3270-3.3.10-ibmhostpath.patch, NONE, 1.1 x3270-3.3.10-paths.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 x3270.spec, 1.35, 1.36 c3270-332-ncursesw.patch, 1.1, NONE x3270-3.3-encoding.patch, 1.1, NONE x3270-3.3-modularX.patch, 1.1, NONE x3270-3.3-syntax.patch, 1.1, NONE x3270-3.3.4-path.patch, 1.1, NONE x3270-3.3.6-redhat.patch, 1.1, NONE x3270-3.3.6-resize.patch, 1.1, NONE
Karsten Hopp
karsten at fedoraproject.org
Tue Dec 8 14:26:28 UTC 2009
Author: karsten
Update of /cvs/extras/rpms/x3270/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20870
Modified Files:
.cvsignore sources x3270.spec
Added Files:
x3270-3.3.10-ibmhostpath.patch x3270-3.3.10-paths.patch
Removed Files:
c3270-332-ncursesw.patch x3270-3.3-encoding.patch
x3270-3.3-modularX.patch x3270-3.3-syntax.patch
x3270-3.3.4-path.patch x3270-3.3.6-redhat.patch
x3270-3.3.6-resize.patch
Log Message:
- update to 3.3.10ga4-1
x3270-3.3.10-ibmhostpath.patch:
c3270-3.3/Makefile | 8 ++++----
c3270-3.3/c3270.man | 2 +-
c3270-3.3/host.c | 2 +-
s3270-3.3/X3270.xad | 2 +-
s3270-3.3/host.c | 2 +-
s3270-3.3/s3270.man | 2 +-
x3270-3.3/Imakefile.in | 8 ++++----
x3270-3.3/Makefile.in | 8 ++++----
x3270-3.3/X3270.xad | 2 +-
x3270-3.3/ibm_hosts.man | 4 ++--
x3270-3.3/x3270.man | 2 +-
11 files changed, 21 insertions(+), 21 deletions(-)
--- NEW FILE x3270-3.3.10-ibmhostpath.patch ---
diff -up x3270-3.3.10ga4/c3270-3.3/c3270.man.ibmhostspath x3270-3.3.10ga4/c3270-3.3/c3270.man
--- x3270-3.3.10ga4/c3270-3.3/c3270.man.ibmhostspath 2009-12-07 13:06:22.000000000 +0100
+++ x3270-3.3.10ga4/c3270-3.3/c3270.man 2009-12-07 13:09:17.000000000 +0100
@@ -3204,7 +3204,7 @@ backslash character.
If more than one \fB\-xrm\fP option is given for the same resource,
the last one on the command line is used.
.SH "FILES"
-/usr/local/lib/x3270/ibm_hosts
+/etc/ibm_hosts
.br
$HOME/.c3270pro
diff -up x3270-3.3.10ga4/c3270-3.3/glue.c.ibmhostspath x3270-3.3.10ga4/c3270-3.3/glue.c
diff -up x3270-3.3.10ga4/c3270-3.3/host.c.ibmhostspath x3270-3.3.10ga4/c3270-3.3/host.c
--- x3270-3.3.10ga4/c3270-3.3/host.c.ibmhostspath 2009-12-07 13:13:03.000000000 +0100
+++ x3270-3.3.10ga4/c3270-3.3/host.c 2009-12-07 13:14:35.000000000 +0100
@@ -126,7 +126,7 @@ hostfile_init(void)
hostfile_initted = True;
hostfile_name = appres.hostsfile;
if (hostfile_name == CN)
- hostfile_name = xs_buffer("%s/ibm_hosts", appres.conf_dir);
+ hostfile_name = xs_buffer("%s/ibm_hosts", "/etc");
else
hostfile_name = do_subst(appres.hostsfile, True, True);
hf = fopen(hostfile_name, "r");
diff -up x3270-3.3.10ga4/c3270-3.3/html/c3270-man.html.ibmhostspath x3270-3.3.10ga4/c3270-3.3/html/c3270-man.html
diff -up x3270-3.3.10ga4/c3270-3.3/html/Resources.html.ibmhostspath x3270-3.3.10ga4/c3270-3.3/html/Resources.html
diff -up x3270-3.3.10ga4/c3270-3.3/Makefile.ibmhostspath x3270-3.3.10ga4/c3270-3.3/Makefile
diff -up x3270-3.3.10ga4/c3270-3.3/Makefile.in.ibmhostspath x3270-3.3.10ga4/c3270-3.3/Makefile.in
--- x3270-3.3.10ga4/c3270-3.3/Makefile.in.ibmhostspath 2009-12-07 13:06:43.000000000 +0100
+++ x3270-3.3.10ga4/c3270-3.3/Makefile.in 2009-12-07 13:12:43.000000000 +0100
@@ -84,10 +84,10 @@ install:: c3270 x3270if
$(INSTALL_PROGRAM) c3270 $(DESTDIR)$(BINDIR)/c3270
$(INSTALL_PROGRAM) x3270if $(DESTDIR)$(BINDIR)/x3270if
install::
- [ -d $(DESTDIR)$(LIBX3270DIR) ] || \
- mkdir -p $(DESTDIR)$(LIBX3270DIR)
- [ -r $(DESTDIR)$(LIBX3270DIR)/ibm_hosts ] || \
- $(INSTALL_DATA) ibm_hosts $(DESTDIR)$(LIBX3270DIR)/ibm_hosts
+ [ -d $(DESTDIR)/etc ] || \
+ mkdir -p $(DESTDIR)/etc
+ [ -r $(DESTDIR)/etc/ibm_hosts ] || \
+ $(INSTALL_DATA) ibm_hosts $(DESTDIR)/etc/ibm_hosts
@PR at install::
install.man:
diff -up x3270-3.3.10ga4/s3270-3.3/host.c.ibmhostspath x3270-3.3.10ga4/s3270-3.3/host.c
--- x3270-3.3.10ga4/s3270-3.3/host.c.ibmhostspath 2009-12-07 13:17:07.000000000 +0100
+++ x3270-3.3.10ga4/s3270-3.3/host.c 2009-12-07 13:18:19.000000000 +0100
@@ -126,7 +126,7 @@ hostfile_init(void)
hostfile_initted = True;
hostfile_name = appres.hostsfile;
if (hostfile_name == CN)
- hostfile_name = xs_buffer("%s/ibm_hosts", appres.conf_dir);
+ hostfile_name = xs_buffer("%s/ibm_hosts", "/etc");
else
hostfile_name = do_subst(appres.hostsfile, True, True);
hf = fopen(hostfile_name, "r");
diff -up x3270-3.3.10ga4/s3270-3.3/html/Resources.html.ibmhostspath x3270-3.3.10ga4/s3270-3.3/html/Resources.html
diff -up x3270-3.3.10ga4/s3270-3.3/html/s3270-man.html.ibmhostspath x3270-3.3.10ga4/s3270-3.3/html/s3270-man.html
diff -up x3270-3.3.10ga4/s3270-3.3/s3270.man.ibmhostspath x3270-3.3.10ga4/s3270-3.3/s3270.man
--- x3270-3.3.10ga4/s3270-3.3/s3270.man.ibmhostspath 2009-12-07 13:16:49.000000000 +0100
+++ x3270-3.3.10ga4/s3270-3.3/s3270.man 2009-12-07 13:18:34.000000000 +0100
@@ -2015,7 +2015,7 @@ the \fBtraceDir\fP resource.
If more than one \fB\-xrm\fP option is given for the same resource,
the last one on the command line is used.
.SH "FILES"
-/usr/local/lib/x3270/ibm_hosts
+/etc/ibm_hosts
.br
.SH "SEE ALSO"
diff -up x3270-3.3.10ga4/s3270-3.3/X3270.xad.ibmhostspath x3270-3.3.10ga4/s3270-3.3/X3270.xad
--- x3270-3.3.10ga4/s3270-3.3/X3270.xad.ibmhostspath 2009-12-07 13:17:00.000000000 +0100
+++ x3270-3.3.10ga4/s3270-3.3/X3270.xad 2009-12-07 13:18:45.000000000 +0100
@@ -221,7 +221,7 @@ x3270.charsetList: U.S. English (CP 03
! x3270.doConfirms: true
! x3270.debugTracing: true
! x3270.disconnectClear: false
-! x3270.hostsFile: /usr/lib/X11/x3270/ibm_hosts
+! x3270.hostsFile: /etc/ibm_hosts
! x3270.highlightSelect: true
! x3270.idleCommand:
! x3270.idleTimeout: ~7m
diff -up x3270-3.3.10ga4/x3270-3.3/html/ibm_hosts.html.ibmhostspath x3270-3.3.10ga4/x3270-3.3/html/ibm_hosts.html
diff -up x3270-3.3.10ga4/x3270-3.3/html/Resources.html.ibmhostspath x3270-3.3.10ga4/x3270-3.3/html/Resources.html
diff -up x3270-3.3.10ga4/x3270-3.3/html/x3270-man.html.ibmhostspath x3270-3.3.10ga4/x3270-3.3/html/x3270-man.html
diff -up x3270-3.3.10ga4/x3270-3.3/ibm_hosts.man.ibmhostspath x3270-3.3.10ga4/x3270-3.3/ibm_hosts.man
--- x3270-3.3.10ga4/x3270-3.3/ibm_hosts.man.ibmhostspath 2009-12-07 12:59:42.000000000 +0100
+++ x3270-3.3.10ga4/x3270-3.3/ibm_hosts.man 2009-12-07 13:01:03.000000000 +0100
@@ -3,7 +3,7 @@
.SH "NAME"
ibm_hosts \- host database for x3270 and c3270
.SH "SYNOPSIS"
-/usr/lib/X11/x3270/ibm_hosts
+/etc/ibm_hosts
.SH "DESCRIPTION"
The \fBibm_hosts\fP
file contains information regarding IBM hosts on the network.
@@ -82,7 +82,7 @@ The name \fBvm\fP will cause the 3270 em
enter the string `3' on the second data-entry field on the screen, and
send the Enter \s-1AID\s+1 sequence.
.SH "FILES"
-/usr/lib/X11/x3270/ibm_hosts
+/etc/ibm_hosts
.SH "SEE ALSO"
x3270(1),
c3270(1)
diff -up x3270-3.3.10ga4/x3270-3.3/Imakefile.in.ibmhostspath x3270-3.3.10ga4/x3270-3.3/Imakefile.in
--- x3270-3.3.10ga4/x3270-3.3/Imakefile.in.ibmhostspath 2009-12-07 12:57:19.000000000 +0100
+++ x3270-3.3.10ga4/x3270-3.3/Imakefile.in 2009-12-07 13:03:46.000000000 +0100
@@ -190,8 +190,8 @@ $(DESTDIR)$(FONTINSTDIR)/fonts.dir::
/* Extra install rule for the sample ibm_hosts file (runs only if there is
no ibm_hosts file installed yet). */
install:: $(HOSTSFILE)
- @[ -r $(DESTDIR)$(LIBX3270DIR)/$(HOSTSFILE) ] || \
- $(INSTALL) -c $(INSTDATFLAGS) $(HOSTSFILE) $(DESTDIR)$(LIBX3270DIR)/$(HOSTSFILE)
+ @[ -r $(DESTDIR)/etc/$(HOSTSFILE) ] || \
+ $(INSTALL) -c $(INSTDATFLAGS) $(HOSTSFILE) $(DESTDIR)/etc/$(HOSTSFILE)
/*
* Install rules for x3270if, x3270-script and ibm_hosts man pages.
@@ -220,8 +220,8 @@ install.byprefix::
$(MKFONTDIR) $(DESTDIR)$(autoconf_fontinstdir)
chmod u=rwx,go=rx $(DESTDIR)$(autoconf_fontinstdir)
chmod a=r $(DESTDIR)$(autoconf_fontinstdir)/fonts.dir
- @[ -r $(DESTDIR)$(LIBX3270DIR)/$(HOSTSFILE) ] || \
- (set -x; $(INSTALL) -c $(INSTDATFLAGS) $(HOSTSFILE) $(DESTDIR)$(LIBX3270DIR)/$(HOSTSFILE))
+ @[ -r $(DESTDIR)/etc/$(HOSTSFILE) ] || \
+ (set -x; $(INSTALL) -c $(INSTDATFLAGS) $(HOSTSFILE) $(DESTDIR)/etc/$(HOSTSFILE))
/******************************************************************************
* Clean rules. *
diff -up x3270-3.3.10ga4/x3270-3.3/Makefile.in.ibmhostspath x3270-3.3.10ga4/x3270-3.3/Makefile.in
--- x3270-3.3.10ga4/x3270-3.3/Makefile.in.ibmhostspath 2009-12-07 12:59:22.000000000 +0100
+++ x3270-3.3.10ga4/x3270-3.3/Makefile.in 2009-12-07 13:16:01.000000000 +0100
@@ -127,10 +127,10 @@ install:: x3270 x3270if
$(INSTALL_PROGRAM) x3270 $(DESTDIR)$(BINDIR)/x3270
$(INSTALL_PROGRAM) x3270if $(DESTDIR)$(BINDIR)/x3270if
install::
- [ -d $(DESTDIR)$(LIBX3270DIR) ] || \
- mkdir -p $(DESTDIR)$(LIBX3270DIR)
- [ -r $(DESTDIR)$(LIBX3270DIR)/ibm_hosts ] || \
- $(INSTALL_DATA) ibm_hosts $(DESTDIR)$(LIBX3270DIR)/ibm_hosts
+ [ -d $(DESTDIR)/etc ] || \
+ mkdir -p $(DESTDIR)/etc
+ [ -r $(DESTDIR)/etc/ibm_hosts ] || \
+ $(INSTALL_DATA) ibm_hosts $(DESTDIR)/etc/ibm_hosts
install::
[ -d $(DESTDIR)$(CIFONTDIR) ] || \
mkdir -p $(DESTDIR)$(CIFONTDIR)
diff -up x3270-3.3.10ga4/x3270-3.3/X3270.ad.ibmhostspath x3270-3.3.10ga4/x3270-3.3/X3270.ad
--- x3270-3.3.10ga4/x3270-3.3/X3270.xad.ibmhostspath 2009-12-07 12:59:53.000000000 +0100
+++ x3270-3.3.10ga4/x3270-3.3/X3270.xad 2009-12-07 13:05:28.000000000 +0100
@@ -214,7 +214,7 @@ x3270.charsetList: U.S. English (CP 03
! x3270.doConfirms: true
! x3270.debugTracing: true
! x3270.disconnectClear: false
-! x3270.hostsFile: /usr/lib/X11/x3270/ibm_hosts
+! x3270.hostsFile: /etc/ibm_hosts
! x3270.highlightSelect: true
! x3270.idleCommand:
! x3270.idleTimeout: ~7m
diff -up x3270-3.3.10ga4/x3270-3.3/x3270.man.ibmhostspath x3270-3.3.10ga4/x3270-3.3/x3270.man
--- x3270-3.3.10ga4/x3270-3.3/x3270.man.ibmhostspath 2009-12-07 12:59:05.000000000 +0100
+++ x3270-3.3.10ga4/x3270-3.3/x3270.man 2009-12-07 13:05:42.000000000 +0100
@@ -5008,7 +5008,7 @@ T}
The special types \fBsocks4a\fP and \fBsocks5d\fP can also be used to force
the proxy server to do the hostname resolution for the SOCKS protocol.
.SH "FILES"
-/usr/lib/X11/x3270/ibm_hosts
+/etc/ibm_hosts
.br
$HOME/.x3270pro
x3270-3.3.10-paths.patch:
cms_logon.bash | 2 +-
peer_script.expect | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE x3270-3.3.10-paths.patch ---
diff -up x3270-3.3.10ga4/x3270-3.3/Examples/peer_script.expect.expectpath x3270-3.3.10ga4/x3270-3.3/Examples/peer_script.expect
--- x3270-3.3.10ga4/x3270-3.3/Examples/peer_script.expect.expectpath 2009-12-04 13:56:39.000000000 +0100
+++ x3270-3.3.10ga4/x3270-3.3/Examples/peer_script.expect 2009-12-04 13:56:44.000000000 +0100
@@ -1,4 +1,4 @@
-#! /usr/local/bin/expect
+#! /usr/bin/expect
# TSO login script, which runs as a peer of x3270.
# expect version
diff -up x3270-3.3.10ga4/x3270-3.3/Examples/cms_logon.bash.bashpath x3270-3.3.10ga4/x3270-3.3/Examples/cms_logon.bash
--- x3270-3.3.10ga4/x3270-3.3/Examples/cms_logon.bash.bashpath 2009-12-04 13:58:21.000000000 +0100
+++ x3270-3.3.10ga4/x3270-3.3/Examples/cms_logon.bash 2009-12-04 13:59:25.000000000 +0100
@@ -1,4 +1,4 @@
-#! /usr/local/bin/bash
+#! /bin/bash
# Copyright (c) 1995-2009, Paul Mattes.
# All rights reserved.
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/x3270/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore 8 Aug 2007 15:18:49 -0000 1.5
+++ .cvsignore 8 Dec 2009 14:26:27 -0000 1.6
@@ -1,2 +1 @@
-c3270-3.3.6.tgz
-x3270-3.3.6.tgz
+suite3270-3.3.10ga4-src.tgz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/x3270/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources 8 Aug 2007 15:18:49 -0000 1.5
+++ sources 8 Dec 2009 14:26:27 -0000 1.6
@@ -1,2 +1 @@
-d3eb409c406e0ff5ed9a3f0ae4b5452e c3270-3.3.6.tgz
-3017011d1c33bb18a609b06379bf6ba6 x3270-3.3.6.tgz
+13d904e46cf7cea1dd9b0cdb5d1a3ebd suite3270-3.3.10ga4-src.tgz
Index: x3270.spec
===================================================================
RCS file: /cvs/extras/rpms/x3270/devel/x3270.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- x3270.spec 21 Aug 2009 16:29:04 -0000 1.35
+++ x3270.spec 8 Dec 2009 14:26:28 -0000 1.36
@@ -5,22 +5,22 @@
%define desktop_file_utils_version 0.2.93
%endif
+%define majorver 3.3
Summary: An X Window System based IBM 3278/3279 terminal emulator
Name: x3270
-Version: 3.3.6
-Release: 10%{?dist}
+Version: 3.3.10ga4
+Release: 1%{?dist}
License: MIT
Group: Applications/Internet
-URL: http://www.geocities.com/SiliconValley/Peaks/7814
-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.6-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
+URL: http://x3270.sourceforge.net/
+Source0: http://downloads.sourceforge.net/project/x3270/x3270/3.3.10ga4/suite3270-%{version}-src.tgz
+# c3270-3.3 pr3287-3.3 s3270-3.3 tcl3270-3.3 wc3270-3.3 wpr3287-3.3 ws3270-3.3 x3270-3.3
+#
+Source1: x3270.png
+Source2: x3270.desktop
+Patch0: x3270-3.3.10-paths.patch
+Patch1: x3270-3.3.10-ibmhostpath.patch
+
Prereq: xorg-x11-font-utils
BuildPreReq: ncurses-devel readline-devel glibc-devel openssl-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -72,64 +72,75 @@ Install the %{name}-text package if you
3278/3279 terminal emulator without running X.
%prep
-%setup -q -n x3270-3.3 -a 1
+rm -rf x3270-%{version}
+mkdir x3270-%{version}
+tar -xz -C x3270-%{version} -f %{SOURCE0}
+cd x3270-%{version}
+# delete windows and tcl sources:
+rm -rf wpr3287* wc3270* ws3270* tcl3270*
%patch0 -p1
%patch1 -p1
-%patch2 -p1
-#patch3 -p1
-%patch4 -p1
%build
+cd x3270-%{version}
+# Fix end of line encodings
+perl -pi -e "s/
//" */html/Keymap.html */html/Build.html
# Set LIBX3270DIR to something we can share with x3270-text
-perl -pi -e "s,LIBX3270DIR =.*,LIBX3270DIR = %{_datadir}/x3270,g" Imakefile.in
+perl -pi -e "s,LIBX3270DIR =.*,LIBX3270DIR = %{_datadir}/x3270,g" x3270-%{majorver}/Imakefile.in
# use rpmoptflags for x3270if
-perl -pi -e 's/ -o x3270if x3270if.c/ \$(CCOPTIONS) -o x3270if x3270if.c/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=%{fontdir} --x-includes=/usr/include/X11 --x-libraries=/%{_libdir}/X11 --enable-app-defaults
-xmkmf
-make Makefiles
-make includes
-make depend
+perl -pi -e 's/ -o x3270if x3270if.c/ \$(CCOPTIONS) -o x3270if x3270if.c/g' x3270-%{majorver}/Imakefile.in
+for i in x3270-%{majorver} c3270-%{majorver} pr3287-%{majorver} s3270-%{majorver}; do
+( cd $i
+%configure --prefix=%{_prefix}/ --with-fontdir=%{fontdir} --x-includes=/usr/include/X11 --x-libraries=/%{_libdir}/X11 --enable-app-defaults
make %{?_smp_mflags} CCOPTIONS="$RPM_OPT_FLAGS"
-cd c3270-3.3
-autoconf
-libtoolize --copy --force
-%configure --prefix=%{_prefix}
-make %{?_smp_mflags}
+)
+done
%install
+cd x3270-%{version}
rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/x3270
mkdir -p $RPM_BUILD_ROOT%{_prefix}/bin
mkdir -p $RPM_BUILD_ROOT%{_datadir}/x3270
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man5
mkdir -p ${RPM_BUILD_ROOT}%{fontdir}
mkdir -p ${RPM_BUILD_ROOT}/%{_datadir}/icons/hicolor/48x48/apps
mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/X11/app-defaults
mkdir -p ${RPM_BUILD_ROOT}%{catalogue}
-# XXX Hack around mkfontdir madness on install.
-install -m755 x3270 $RPM_BUILD_ROOT%{_prefix}/bin
-install -m755 x3270if $RPM_BUILD_ROOT%{_prefix}/bin
-install -m644 *pcf.gz $RPM_BUILD_ROOT%{fontdir}
-install -m644 ibm_hosts $RPM_BUILD_ROOT%{_sysconfdir}/
-install -m755 pr3287/pr3287 $RPM_BUILD_ROOT%{_prefix}/bin
-install -m644 pr3287/pr3287.man $RPM_BUILD_ROOT%{_mandir}/man1/pr3287.1x
-cd c3270-3.3
-install -m755 c3270 $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 -m755 x3270-%{majorver}/x3270 $RPM_BUILD_ROOT%{_prefix}/bin
+install -m755 x3270-%{majorver}/x3270if $RPM_BUILD_ROOT%{_prefix}/bin
+install -m644 x3270-%{majorver}/*pcf.gz $RPM_BUILD_ROOT%{fontdir}
+install -m644 x3270-%{majorver}/ibm_hosts $RPM_BUILD_ROOT%{_sysconfdir}/
+install -m644 x3270-%{majorver}/X3270.xad ${RPM_BUILD_ROOT}%{_datadir}/X11/app-defaults/X3270
+install -m644 x3270-%{majorver}/x3270.man $RPM_BUILD_ROOT%{_mandir}/man1/x3270.1
+install -m644 x3270-%{majorver}/x3270if.man $RPM_BUILD_ROOT%{_mandir}/man1/x3270if.1
+install -m644 x3270-%{majorver}/x3270-script.man $RPM_BUILD_ROOT%{_mandir}/man1/x3270-script.1
+install -m644 x3270-%{majorver}/ibm_hosts.man $RPM_BUILD_ROOT%{_mandir}/man5/ibm_hosts.5
+
+install -m755 pr3287-%{majorver}/pr3287 $RPM_BUILD_ROOT%{_prefix}/bin
+install -m644 pr3287-%{majorver}/pr3287.man $RPM_BUILD_ROOT%{_mandir}/man1/pr3287.1x
+
+install -m755 c3270-%{majorver}/c3270 $RPM_BUILD_ROOT%{_prefix}/bin
+install -m644 c3270-%{majorver}/c3270.man $RPM_BUILD_ROOT%{_mandir}/man1/c3270.1
-install -m644 %{SOURCE2} ${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/48x48/apps
+install -m755 s3270-%{majorver}/s3270 $RPM_BUILD_ROOT%{_prefix}/bin
+install -m644 s3270-%{majorver}/s3270.man $RPM_BUILD_ROOT%{_mandir}/man1/s3270.1
+
+install -m644 %{SOURCE1} ${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
+install -m644 %{SOURCE2} ${RPM_BUILD_ROOT}%{_sysconfdir}/X11/applnk/Utilities
ln -sf %{fontdir} $RPM_BUILD_ROOT%{catalogue}/x3270
+mv x3270-%{majorver}/README* x3270-%{majorver}/LICENSE x3270-%{majorver}/Examples x3270-%{majorver}/html .
+#mv c3270-%{majorver}/Examples/* Examples
+mv c3270-%{majorver}/README README.c3270
+mv c3270-%{majorver}/html html_c3270
+mv pr3287-%{majorver}/README README.pr3287
+mv pr3287-%{majorver}/html html_pr3287
+mv s3270-%{majorver}/README README.s3270
+mv s3270-%{majorver}/html html_s3270
%if %{desktop_file}
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications
@@ -143,8 +154,8 @@ rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/X11
%endif
-rm -f Examples/*.rh Examples/*.orig
-chmod -x Examples/* html/*
+rm -f */Examples/*.rh */Examples/*.orig
+chmod -x Examples/* html*/*
%clean
rm -rf $RPM_BUILD_ROOT
@@ -167,11 +178,13 @@ fi
%files
%defattr(-,root,root)
-%doc README LICENSE Examples html
+%doc %{name}-%{version}/{README*,LICENSE,Examples,html*}
+%{_prefix}/bin/s3270
%{_prefix}/bin/pr3287
%{_prefix}/bin/x3270if
%exclude %{_mandir}/man1/c3270*
%{_mandir}/man1/*
+%{_mandir}/man5/*
%dir %{_datadir}/x3270
%config(noreplace) %{_sysconfdir}/ibm_hosts
@@ -195,6 +208,9 @@ fi
%{_mandir}/man1/c3270*
%changelog
+* Tue Dec 08 2009 Karsten Hopp <karsten at redhat.com> 3.3.10ga4-1
+- update to 3.3.10ga4-1
+
* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 3.3.6-10
- rebuilt with new openssl
--- c3270-332-ncursesw.patch DELETED ---
--- x3270-3.3-encoding.patch DELETED ---
--- x3270-3.3-modularX.patch DELETED ---
--- x3270-3.3-syntax.patch DELETED ---
--- x3270-3.3.4-path.patch DELETED ---
--- x3270-3.3.6-redhat.patch DELETED ---
--- x3270-3.3.6-resize.patch DELETED ---
More information about the fedora-extras-commits
mailing list