[packages/suite3270] - fix ibm_hosts path in manuals - fix interpreters paths in examples - added icon and desktop entry

baggins baggins at pld-linux.org
Fri Jul 19 18:54:41 CEST 2013 

commit 6584be36c0f0d1da4872ba38b422cbde2205994a
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Fri Jul 19 18:53:38 2013 +0200

    - fix ibm_hosts path in manuals
    - fix interpreters paths in examples
    - added icon and desktop entry for x3270

 ibmhostpath.patch |  84 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 suite3270.spec    |  17 +++++++++--
 x3270-paths.patch |  18 ++++++++++++
 x3270.desktop     |   9 ++++++
 x3270.png         | Bin 0 -> 280 bytes
 5 files changed, 126 insertions(+), 2 deletions(-)
---
diff --git a/suite3270.spec b/suite3270.spec
index 3f88733..66134b9 100644
--- a/suite3270.spec
+++ b/suite3270.spec
@@ -7,6 +7,10 @@ License:	MIT-like
 Group:		Applications/Terminal
 Source0:	http://x3270.bgp.nu/download/%{name}-%{version}-src.tgz
 # Source0-md5:	df11e3f16c0a6b2e5b1ddb3c46fb3f88
+Source1:	x3270.png
+Source2:	x3270.desktop
+Patch0:		x3270-paths.patch
+Patch1:		ibmhostpath.patch
 URL:		http://x3270.bgp.nu/
 BuildRequires:	ncurses-devel
 BuildRequires:	readline-devel
@@ -79,13 +83,14 @@ x3270 jest dostępny w kilku różnych postaciach:
 
 %prep
 %setup -q -c
+%patch0 -p1
+%patch1 -p1
 
 %build
 export ac_cv_lib_nsl_gethostbyname=no
 CPPFLAGS="%{rpmcppflags} -I/usr/include/ncurses"
 cd c3270-3.3
-%configure \
-	LIBS="-ltinfow"
+%configure
 %{__make}
 cd ../pr3287-3.3
 %configure
@@ -104,6 +109,7 @@ cd ../x3270-3.3
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT/{%{_desktopdir},%{_iconsdir}/hicolor/48x48/apps}
 
 %{__make} -j1 -C c3270-3.3 install \
 	DESTDIR=$RPM_BUILD_ROOT
@@ -121,6 +127,9 @@ rm -rf $RPM_BUILD_ROOT
 	DESTDIR=$RPM_BUILD_ROOT \
 	BINDIR=%{_bindir}
 
+install -p %{SOURCE1} ${RPM_BUILD_ROOT}%{_iconsdir}/hicolor/48x48/apps
+install -p %{SOURCE2} $RPM_BUILD_ROOT/%{_desktopdir}
+
 rm -rf doc
 install -d doc/{c3270,pr3287,s3270,tcl3270,x3270}
 cp -a c3270-3.3/{LICENSE,README,html} doc/c3270
@@ -134,9 +143,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 fontpostinst misc
+%update_icon_cache hicolor
 
 %postun
 fontpostinst misc
+%update_icon_cache hicolor
 
 %files
 %defattr(644,root,root,755)
@@ -150,3 +161,5 @@ fontpostinst misc
 %dir %{_sysconfdir}/x3270
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/x3270/ibm_hosts
 %{_fontsdir}/misc/3270*.pcf.gz
+%{_iconsdir}/hicolor/48x48/apps/x3270.png
+%{_desktopdir}/x3270.desktop
diff --git a/ibmhostpath.patch b/ibmhostpath.patch
new file mode 100644
index 0000000..a6bca44
--- /dev/null
+++ b/ibmhostpath.patch
@@ -0,0 +1,84 @@
+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/x3270/ibm_hosts
+ .br
+ $HOME/.c3270pro
+ 
+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/x3270/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/x3270/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/x3270/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/x3270/ibm_hosts
+ .SH "SEE ALSO"
+ x3270(1),
+ c3270(1)
+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/x3270/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/x3270/ibm_hosts
+ .br
+ $HOME/.x3270pro
+ 
diff --git a/x3270-paths.patch b/x3270-paths.patch
new file mode 100644
index 0000000..e3e9a3a
--- /dev/null
+++ b/x3270-paths.patch
@@ -0,0 +1,18 @@
+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.
diff --git a/x3270.desktop b/x3270.desktop
new file mode 100644
index 0000000..d87ab9f
--- /dev/null
+++ b/x3270.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=x3270
+GenericName=Terminal emulator
+Type=Application
+Comment=3270 terminal emulator
+Exec=x3270
+Icon=x3270
+StartupNotify=true
+Categories=System;Utility;TerminalEmulator;
diff --git a/x3270.png b/x3270.png
new file mode 100644
index 0000000..1a474ea
Binary files /dev/null and b/x3270.png differ
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/suite3270.git/commitdiff/6584be36c0f0d1da4872ba38b422cbde2205994a

More information about the pld-cvs-commit mailing list