From 966e143cbe696747f8deb9c8052a0b719f70be52024c0fbd0fb9687d78ecfcf5 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Thu, 25 Sep 2014 08:25:58 +0000 Subject: [PATCH] Accepting request 251788 from home:scarabeus_iv:branches:Base:System - Version bump to 3.3.14 and update x026 to 1.2: * For full change list read: http://x3270.bgp.nu/documentation-relnotes.html - Remove suse readme which is totally pointless - Clean spec with spec-cleaner - Remove unused patch gcc4.diff OBS-URL: https://build.opensuse.org/request/show/251788 OBS-URL: https://build.opensuse.org/package/show/Base:System/x3270?expand=0&rev=30 --- README.SUSE | 29 --------- gcc4.diff | 10 --- suite3270-3.3.12ga13-src.tgz | 3 - suite3270-3.3.14ga11-src.tgz | 3 + x026-1.0.tgz | 3 - x026-1.2.tgz | 3 + x026-offset.diff | 44 +++++++++----- x3270.changes | 10 +++ x3270.spec | 114 ++++++++++++++++------------------- 9 files changed, 97 insertions(+), 122 deletions(-) delete mode 100644 README.SUSE delete mode 100644 gcc4.diff delete mode 100644 suite3270-3.3.12ga13-src.tgz create mode 100644 suite3270-3.3.14ga11-src.tgz delete mode 100644 x026-1.0.tgz create mode 100644 x026-1.2.tgz diff --git a/README.SUSE b/README.SUSE deleted file mode 100644 index 7a0c8c4..0000000 --- a/README.SUSE +++ /dev/null @@ -1,29 +0,0 @@ -There are a few known open bugs which are listed in -http://x3270.bgp.nu/HotBugs.html: here is an excerpt from that list, -with those bugs removed, that are fixed for SuSE Linux. - -Known Bugs in x3270, c3270, s3270, tcl3270 and pr3287 3.2.20 - -------------------------------------------------------------------------------- -Updated 17. February 2003 - -Bugs Fixed, but not yet in a Patch Release - - There are no known problems. - -Outstanding Bugs - - 1. Issues with the Idle Command Pop-Up - - The Idle Command Pop-Up has a number of deficiencies: - - * The syntax for the Timeout value is not explained -- it is an optional '~' - prefix to add +/-10% jitter to the time, a number, and a required - one-letter suffix (s for seconds, m for minutes, h for hours). - * If the timeout syntax is wrong, there is no error pop-up, and the values - are forgotten. - * The changed values are not saved with the Save Changed Options in File menu - option. - - A (rather large) patch to correct these problems is under development. - diff --git a/gcc4.diff b/gcc4.diff deleted file mode 100644 index 2036165..0000000 --- a/gcc4.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- x026-1.0/x026.c.orig 2005-04-21 08:38:42.002229962 +0200 -+++ x026-1.0/x026.c 2005-04-21 08:39:02.681636675 +0200 -@@ -12,6 +12,7 @@ - #include - #include - #include -+#include - #include - #include - #include diff --git a/suite3270-3.3.12ga13-src.tgz b/suite3270-3.3.12ga13-src.tgz deleted file mode 100644 index f2dc4a7..0000000 --- a/suite3270-3.3.12ga13-src.tgz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b3b75def2f4a996b04e26aa1886e6b47723562432c95f9d04191bcf6e45c13bb -size 6708810 diff --git a/suite3270-3.3.14ga11-src.tgz b/suite3270-3.3.14ga11-src.tgz new file mode 100644 index 0000000..d6cf5cc --- /dev/null +++ b/suite3270-3.3.14ga11-src.tgz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:80f0a21e0a298297e4156d1ba413f6a3fd60a6850e05733a8c7dbd30323d2b00 +size 6902551 diff --git a/x026-1.0.tgz b/x026-1.0.tgz deleted file mode 100644 index c2c0a8c..0000000 --- a/x026-1.0.tgz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c121cb94e7af2006f2ef6ef3488f0437ad46c918ae131105687f39c3b5658f21 -size 9653 diff --git a/x026-1.2.tgz b/x026-1.2.tgz new file mode 100644 index 0000000..3a5e64e --- /dev/null +++ b/x026-1.2.tgz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:74f54b63b41551b33649dbc5a76317f41ffdf3009ca545fb1f25ae563548dc96 +size 393202 diff --git a/x026-offset.diff b/x026-offset.diff index d445463..52e224a 100644 --- a/x026-offset.diff +++ b/x026-offset.diff @@ -1,10 +1,12 @@ ---- x026-1.0/x026.c.orig 2003-07-29 10:03:36.000000000 +0200 -+++ x026-1.0/x026.c 2003-07-29 10:41:43.000000000 +0200 -@@ -114,32 +114,32 @@ +diff -urN x026-1.2/x026.c.old x026-1.2/x026.c +--- x026-1.2/x026.c.old 2014-09-24 11:58:03.376699486 +0200 ++++ x026-1.2/x026.c 2014-09-24 12:06:35.460699425 +0200 +@@ -419,34 +419,34 @@ }; /* Xt actions. */ -static void data(Widget, XEvent *, String *, Cardinal *); +-static void multi_punch_data(Widget, XEvent *, String *, Cardinal *); -static void delete_window(Widget, XEvent *, String *, Cardinal *); -static void home(Widget, XEvent *, String *, Cardinal *); -static void left(Widget, XEvent *, String *, Cardinal *); @@ -15,6 +17,7 @@ -static void insert_selection(Widget, XEvent *, String *, Cardinal *); -static void confirm(Widget, XEvent *, String *, Cardinal *); +static void x026_data(Widget, XEvent *, String *, Cardinal *); ++static void x026_multi_punch_data(Widget, XEvent *, String *, Cardinal *); +static void x026_delete_window(Widget, XEvent *, String *, Cardinal *); +static void x026_home(Widget, XEvent *, String *, Cardinal *); +static void x026_left(Widget, XEvent *, String *, Cardinal *); @@ -32,6 +35,7 @@ /* Actions. */ XtActionsRec actions[] = { - { "Data", data }, +- { "MultiPunchData", multi_punch_data }, - { "DeleteWindow", delete_window }, - { "Home", home }, - { "Left", left }, @@ -42,6 +46,7 @@ - { "insert-selection", insert_selection }, - { "confirm", confirm } + { "Data", x026_data }, ++ { "MultiPunchData", x026_multi_punch_data }, + { "DeleteWindow", x026_delete_window }, + { "Home", x026_home }, + { "Left", x026_left }, @@ -54,7 +59,7 @@ }; int actioncount = XtNumber(actions); -@@ -389,7 +389,7 @@ +@@ -788,7 +788,7 @@ XtNborderWidth, BUTTON_BW, XtNborderColor, appres.background, NULL); @@ -63,7 +68,7 @@ /* Create graphics contexts for drawing. */ xgcv.foreground = appres.foreground; -@@ -575,7 +575,7 @@ +@@ -955,7 +955,7 @@ /* Redraw the entire card image. */ static void @@ -72,7 +77,7 @@ { int i; Dimension x, y, w, h; -@@ -641,7 +641,7 @@ +@@ -1027,7 +1027,7 @@ /* Exit. */ static void @@ -81,7 +86,7 @@ { exit(0); } -@@ -696,6 +696,7 @@ +@@ -1082,6 +1082,7 @@ #if defined(SOUND) /*[*/ loud_click(); #endif /*]*/ @@ -89,7 +94,7 @@ } } -@@ -841,7 +842,7 @@ +@@ -1222,7 +1223,7 @@ */ static void @@ -98,7 +103,16 @@ { XKeyEvent *kevent = (XKeyEvent *)event; char buf[10]; -@@ -858,19 +859,19 @@ +@@ -1236,7 +1237,7 @@ + } + + static void +-multi_punch_data(Widget wid, XEvent *event, String *params, Cardinal *num_params) ++x026_multi_punch_data(Widget wid, XEvent *event, String *params, Cardinal *num_params) + { + XKeyEvent *kevent = (XKeyEvent *)event; + char buf[10]; +@@ -1250,19 +1251,19 @@ } static void @@ -121,7 +135,7 @@ { int i; -@@ -882,7 +883,7 @@ +@@ -1274,7 +1275,7 @@ } static void @@ -130,7 +144,7 @@ { if (ccard->next) { ccard = ccard->next; -@@ -892,7 +893,7 @@ +@@ -1284,7 +1285,7 @@ } static void @@ -139,7 +153,7 @@ { int i; -@@ -905,7 +906,7 @@ +@@ -1297,7 +1298,7 @@ /* Throw away this card. */ static void @@ -148,7 +162,7 @@ { int i; -@@ -993,7 +994,7 @@ +@@ -1386,7 +1387,7 @@ } static void @@ -157,12 +171,12 @@ { int i; Atom a; -@@ -1115,7 +1116,7 @@ +@@ -1562,7 +1563,7 @@ } static void -confirm(Widget w, XEvent *event, String *params, Cardinal *num_params) +x026_confirm(Widget w, XEvent *event, String *params, Cardinal *num_params) { - save_file(); + save_file_ascii(); } diff --git a/x3270.changes b/x3270.changes index 40b4cb9..63f59d9 100644 --- a/x3270.changes +++ b/x3270.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Wed Sep 24 11:03:06 UTC 2014 - tchvatal@suse.com + +- Version bump to 3.3.14 and update x026 to 1.2: + * For full change list read: + http://x3270.bgp.nu/documentation-relnotes.html +- Remove suse readme which is totally pointless +- Clean spec with spec-cleaner +- Remove unused patch gcc4.diff + ------------------------------------------------------------------- Thu Sep 18 20:36:53 UTC 2014 - sfalken@opensuse.org diff --git a/x3270.spec b/x3270.spec index cc87092..044469f 100644 --- a/x3270.spec +++ b/x3270.spec @@ -16,10 +16,22 @@ # -%define appdefdir %{_datadir}/X11 - +%define _suffix ga11 +%define _fullname suite3270-%{version}%{_suffix} +%define _x026ver 1.2 Name: x3270 -BuildRequires: autoconf +Version: 3.3.14 +Release: 0 +Summary: A Family of IBM 3270 Terminal Emulators +License: MIT +Group: System/X11/Terminals +Url: http://x3270.bgp.nu +Source0: http://download.sourceforge.net/%{name}/%{_fullname}-src.tgz +Source1: http://download.sourceforge.net/%{name}/x026-%{_x026ver}.tgz +Patch0: mknod.patch +Patch100: usr_local_bin.patch +Patch102: x026-offset.diff +Patch104: pr3270-memleak.patch BuildRequires: bdftopcf BuildRequires: fdupes BuildRequires: fontpackages-devel @@ -29,20 +41,6 @@ BuildRequires: openssl-devel BuildRequires: tcl-devel BuildRequires: xorg-x11 BuildRequires: xorg-x11-devel -Version: 3.3.12 -Release: 0 -Summary: A Family of IBM 3270 Terminal Emulators -License: MIT -Group: System/X11/Terminals -Url: http://x3270.bgp.nu -Source0: suite3270-3.3.12ga13-src.tgz -Source5: README.SUSE -Source6: http://x3270.bgp.nu/download/x026-1.0.tgz -Patch: mknod.patch -Patch100: usr_local_bin.patch -Patch102: x026-offset.diff -Patch104: pr3270-memleak.patch -Patch105: gcc4.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -91,32 +89,27 @@ x026 is a fun toy which emulates an x026 puncher. # will also hold the common config.cache # -q uietly -c reate -name all3270 # -a fter changing into all3270, expand sources -%setup -q -c -n all3270 -T -a0 -a6 -%patch +%setup -q -c -n all3270 -T -a0 -a1 +%patch0 %patch100 %patch102 %patch104 -%patch105 %build -export CFLAGS="$RPM_OPT_FLAGS" +export CFLAGS="%{optflags}" export LIBX3270DIR=%{_sysconfdir}/x3270 # the tcl variant cd tcl3270-3.3 - autoconf %configure \ --cache-file=../config.cache \ - --with-tcl=%tcl_version \ --enable-ssl - make LIBX3270DIR=${LIBX3270DIR} + make %{?_smp_mflags} LIBX3270DIR=${LIBX3270DIR} cd .. # the X variant cd x3270-3.3 - # pr3287 is built from the separate source pr3287*.tgz above. %configure \ --cache-file=../config.cache \ --enable-app-defaults \ - --without-pr3287 \ --x-includes=%{_includedir} \ --x-libraries=%{_libdir} \ --with-all-xinstall \ @@ -124,40 +117,37 @@ cd x3270-3.3 --enable-ssl xmkmf -a make depend - make LIBX3270DIR=${LIBX3270DIR} + make %{?_smp_mflags} LIBX3270DIR=${LIBX3270DIR} cd .. # the console variant cd c3270-3.3 %configure \ --cache-file=../config.cache \ - --without-pr3287 \ --enable-ssl - make LIBX3270DIR=${LIBX3270DIR} + make %{?_smp_mflags} LIBX3270DIR=${LIBX3270DIR} cd .. # the scripting variant cd s3270-3.3 %configure \ --cache-file=../config.cache \ --enable-ssl - make LIBX3270DIR=${LIBX3270DIR} + make %{?_smp_mflags} LIBX3270DIR=${LIBX3270DIR} cd .. # the printer cd pr3287-3.3 %configure \ --cache-file=../config.cache \ --enable-ssl - make LIBX3270DIR=${LIBX3270DIR} + make %{?_smp_mflags} LIBX3270DIR=${LIBX3270DIR} cd .. # the IBM 026 keypunch emulator -cd x026-1.0 +cd x026-%{_x026ver} xmkmf - make x026 + make %{?_smp_mflags} cd .. %install export LIBX3270DIR=%{_sysconfdir}/x3270 -# abort on error -set -e # create the default directory structure in the build root mkdir --parents %{buildroot}{%{_bindir},%{_mandir}/{man1,man5}} # the X variant @@ -169,9 +159,9 @@ cd x3270-3.3 # want in the package. remove that: rm %{buildroot}%{_miscfontsdir}/fonts.dir install -d -m 755 \ - %{buildroot}%{appdefdir}/app-defaults + %{buildroot}%{_datadir}/X11/app-defaults install -m 644 X3270.xad \ - %{buildroot}%{appdefdir}/app-defaults/X3270 + %{buildroot}%{_datadir}/X11/app-defaults/X3270 # clean up: # remove remainders of patching the examples, if existing rm -v Examples/*.orig || true @@ -197,34 +187,34 @@ cd pr3287-3.3 make DESTDIR=%{buildroot} LIBX3270DIR=${LIBX3270DIR} install.man cd .. # the IBM 026 keypunch emulator -cd x026-1.0 - make DESTDIR=%{buildroot} install +cd x026-%{_x026ver} +make DESTDIR=%{buildroot} install install.man cd .. # move site config files to the standard locations -mkdir -p %{buildroot}/usr/lib/x3270 +mkdir -p %{buildroot}%{_libexecdir}/x3270 # this is a per-site, not a per-machine config file chmod 644 %{buildroot}%{_sysconfdir}/x3270/ibm_hosts -cp -a %{S:5} . -# remove man-pages in /usr/man -rm -rf %{buildroot}/usr/man/man{1,5} # set permissions correct chmod ugo-x %{buildroot}%{_mandir}/man{1,5}/* # copy the docs -mkdir -p %{buildroot}%{_docdir}/%name -cp -pr --parents x3270-3.3/{Examples,html,Playback} %{buildroot}%{_docdir}/%name -cp -pr --parents c3270-3.3/html %{buildroot}%{_docdir}/%name -cp -pr --parents pr3287-3.3/html %{buildroot}%{_docdir}/%name -cp -pr --parents s3270-3.3/{Examples,html} %{buildroot}%{_docdir}/%name -cp -pr --parents tcl3270-3.3/{Examples,html} %{buildroot}%{_docdir}/%name +mkdir -p %{buildroot}%{_docdir}/%{name} +cp -pr --parents Playback %{buildroot}%{_docdir}/%{name} +cp -pr --parents x3270-3.3/{Examples,html} %{buildroot}%{_docdir}/%{name} +cp -pr --parents c3270-3.3/html %{buildroot}%{_docdir}/%{name} +cp -pr --parents pr3287-3.3/html %{buildroot}%{_docdir}/%{name} +cp -pr --parents s3270-3.3/{Examples,html} %{buildroot}%{_docdir}/%{name} +cp -pr --parents tcl3270-3.3/{Examples,html} %{buildroot}%{_docdir}/%{name} # create symlinks in documentation -%fdupes -s %{buildroot}/%{_docdir} -%reconfigure_fonts_scriptlets +%fdupes -s %{buildroot}/%{_docdir} +%{reconfigure_fonts_scriptlets} %files %defattr(-,root,root,755) # common files %dir %{_sysconfdir}/x3270 +%dir %{_docdir}/%{name} +%dir %{_docdir}/%{name}/* %config(noreplace) %{_sysconfdir}/x3270/ibm_hosts %doc %{_mandir}/man5/ibm_hosts.5.gz %doc %{_mandir}/man1/x3270if.1.gz @@ -232,33 +222,33 @@ cp -pr --parents tcl3270-3.3/{Examples,html} %{buildroot}%{_docdir}/%name %{_bindir}/x3270if # x3270 %{_bindir}/x3270 -%{appdefdir}/app-defaults/X3270 +%{_datadir}/X11/app-defaults/X3270 %dir %{_miscfontsdir} %{_miscfontsdir}/* %doc %{_mandir}/man1/x3270.1x.gz -%doc %{_docdir}/%name/x3270-3.3/Examples -%doc %{_docdir}/%name/x3270-3.3/html -%doc %{_docdir}/%name/x3270-3.3/Playback +%doc %{_docdir}/%{name}/x3270-3.3/Examples +%doc %{_docdir}/%{name}/x3270-3.3/html +%doc %{_docdir}/%{name}/Playback # c3270 %{_bindir}/c3270 %doc %{_mandir}/man1/c3270.1.gz -%doc %{_docdir}/%name/c3270-3.3/html +%doc %{_docdir}/%{name}/c3270-3.3/html # pr3287 %{_bindir}/pr3287 %doc %{_mandir}/man1/pr3287.1.gz -%doc %{_docdir}/%name/pr3287-3.3/html +%doc %{_docdir}/%{name}/pr3287-3.3/html # s3270 %{_bindir}/s3270 %doc %{_mandir}/man1/s3270.1.gz -%doc %{_docdir}/%name/s3270-3.3/Examples -%doc %{_docdir}/%name/s3270-3.3/html +%doc %{_docdir}/%{name}/s3270-3.3/Examples +%doc %{_docdir}/%{name}/s3270-3.3/html # tcl3270 %{_bindir}/tcl3270 %doc %{_mandir}/man1/tcl3270.1.gz -%doc %{_docdir}/%name/tcl3270-3.3/Examples -%doc %{_docdir}/%name/tcl3270-3.3/html +%doc %{_docdir}/%{name}/tcl3270-3.3/Examples +%doc %{_docdir}/%{name}/tcl3270-3.3/html # x026 %{_bindir}/x026 -%doc README.SUSE +%doc %{_mandir}/man1/x026.1x.gz %changelog