Accepting request 333141 from Education

- Add escdelay.diff to work around unintended use of ncurses API

OBS-URL: https://build.opensuse.org/request/show/333141
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gtypist?expand=0&rev=9

escdelay.diff

@@ -0,0 +1,23 @@
+From: Jan Engelhardt <jengelh@inai.de>
+Date: 2015-09-23 11:59:16.636824539 +0200
+
+In modern ncurses, ESCDELAY is not an lvalue (also because the
+ESCDELAY "variable" is meant to be read-only).
+
+---
+ src/gtypist.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: gtypist-2.9.5/src/gtypist.c
+===================================================================
+--- gtypist-2.9.5.orig/src/gtypist.c
++++ gtypist-2.9.5/src/gtypist.c
+@@ -2205,7 +2205,7 @@ int main( int argc, char **argv )
+ 
+   // Quick hack to get rid of the escape delays
+ #ifdef __NCURSES_H
+-  ESCDELAY = 1;
++  set_escdelay(1);
+ #endif
+ 
+   /* set up colour pairs if possible */

gtypist.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Sep 23 10:21:45 UTC 2015 - jengelh@inai.de
+
+- Add escdelay.diff to work around unintended use of ncurses API
+
 -------------------------------------------------------------------
 Wed Oct  1 12:40:16 UTC 2014 - jengelh@inai.de
 

gtypist.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package gtypist
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -27,6 +27,7 @@ Url:            http://gnu.org/software/gtypist/
 Source:         http://ftp.gnu.org/gnu/gtypist/%name-%version.tar.xz
 Source2:        http://ftp.gnu.org/gnu/gtypist/%name-%version.tar.xz.sig
 Source3:        %name.keyring
+Patch1:         escdelay.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  bison
 BuildRequires:  ncurses-devel
@@ -64,6 +65,7 @@ This subpackage contain the translations for the package gtypist.
 
 %prep
 %setup -q 
+%patch -P 1 -p1
 
 %build 
 %configure
@@ -71,7 +73,7 @@ make %{?_smp_mflags}
 
 %install
 b="%buildroot";
-make install DESTDIR="$b";
+make install DESTDIR="$b"
 %find_lang %name
 
 %post
@@ -79,7 +81,7 @@ for i in "%_infodir"/gtypist*.gz; do
 	%install_info --info-dir="%_infodir" "$i"
 done;
 
-%postun
+%preun
 for i in "%_infodir"/gtypist*.gz; do
 	%install_info_delete --info-dir="%_infodir" "$i"
 done;