diff --git a/dialog-1.1-20080316.tar.bz2 b/dialog-1.1-20080316.tar.bz2 deleted file mode 100644 index 093383a..0000000 --- a/dialog-1.1-20080316.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e2ce6b8a19d5e1aeb6782cddb5eb08bb7d059624c6eeb3c0db469b399d528416 -size 297216 diff --git a/dialog-1.1-20080316.dif b/dialog-1.1-20080727.dif similarity index 87% rename from dialog-1.1-20080316.dif rename to dialog-1.1-20080727.dif index 3726015..d542fe8 100644 --- a/dialog-1.1-20080316.dif +++ b/dialog-1.1-20080727.dif @@ -1,5 +1,5 @@ --- dialog.h -+++ dialog.h 2008-04-10 13:28:27.840374646 +0200 ++++ dialog.h 2008-04-10 13:28:27.840374000 +0200 @@ -38,6 +38,23 @@ #include #include /* fork() etc. */ @@ -85,7 +85,7 @@ #define DLGC_HL_TAG TRUE --- guage.c -+++ guage.c 2008-04-10 12:53:27.303792491 +0200 ++++ guage.c 2008-04-10 12:53:27.303792000 +0200 @@ -229,7 +229,7 @@ dialog_gauge(const char *title, #endif @@ -96,22 +96,23 @@ curs_set(1); dlg_del_window(dialog); --- util.c -+++ util.c 2008-04-10 14:23:03.147824094 +0200 -@@ -1144,11 +1144,11 @@ dlg_exit(int code) ++++ util.c 2008-08-14 11:45:04.905477461 +0200 +@@ -1144,12 +1144,12 @@ dlg_exit(int code) */ if (dialog_state.input) { fclose(dialog_state.input); - dialog_state.input = 0; + dialog_state.input = (FILE*)0; } - if (dialog_state.pipe_input != stdin) { - fclose(dialog_state.pipe_input); -- dialog_state.pipe_input = 0; -+ dialog_state.pipe_input = (FILE*)0; + if (dialog_state.pipe_input) { + if (dialog_state.pipe_input != stdin) { + fclose(dialog_state.pipe_input); +- dialog_state.pipe_input = 0; ++ dialog_state.pipe_input = (FILE*)0; + } } _exit(code); - } -@@ -1518,8 +1518,10 @@ dlg_move_window(WINDOW *win, int height, +@@ -1520,8 +1520,10 @@ dlg_move_window(WINDOW *win, int height, #ifdef HAVE_COLOR if (p->shadow != 0) { if (dialog_state.use_shadow) { diff --git a/dialog-1.1-20080727.tar.bz2 b/dialog-1.1-20080727.tar.bz2 new file mode 100644 index 0000000..1654599 --- /dev/null +++ b/dialog-1.1-20080727.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fa8d1405705079c779a5c198c5125eb31d11e948dce4147b2c3d4051e2bf6998 +size 301155 diff --git a/dialog.changes b/dialog.changes index 0bf1636..4c799f6 100644 --- a/dialog.changes +++ b/dialog.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Aug 14 11:57:19 CEST 2008 - werner@suse.de + +- Update to version 1.1 patchlevel 20080727 +- Use new ncurses ABI 6 which has extend mouse and color support + ------------------------------------------------------------------- Thu Apr 10 12:24:18 UTC 2008 - werner@suse.de diff --git a/dialog.spec b/dialog.spec index 0b080b5..b9f7321 100644 --- a/dialog.spec +++ b/dialog.spec @@ -2,9 +2,16 @@ # spec file for package dialog (Version 1.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -16,11 +23,11 @@ BuildRequires: gpm ncurses-devel License: LGPL v2.1 or later Url: http://invisible-island.net/dialog/ Version: 1.1 -Release: 1 +Release: 24 Summary: Menus and Input Boxes for Shell Scripts Group: Development/Libraries/Other -Source: dialog-1.1-20080316.tar.bz2 -Patch: dialog-1.1-20080316.dif +Source: dialog-1.1-20080727.tar.bz2 +Patch: dialog-1.1-20080727.dif AutoReqProv: on BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -38,13 +45,22 @@ Authors: T.Dickey %prep -%setup -n dialog-1.1-20080316 +%setup -n dialog-1.1-20080727 %patch %build CC=gcc + LIBS="" CFLAGS="$RPM_OPT_FLAGS -pipe -Wall" - export CC CFLAGS + for ncurses_conf in ncursestw6-config ncursesw5-config ; do + ncurses_conf=$(type -p $ncurses_conf 2> /dev/null) || continue + LIBS="${LIBS:+$LIBS }$($ncurses_conf --libs)" + CFLAGS="${CFLAGS:+$CFLAGS }$($ncurses_conf --cflags)" + NCURSES_CONFIG=$ncurses_conf + export NCURSES_CONFIG + break + done + export CC LIBS CFLAGS ./configure --prefix=%{_prefix} \ --infodir=%{_infodir} \ --mandir=%{_mandir} \ @@ -70,6 +86,9 @@ Authors: %_mandir/man1/dialog.1.gz %changelog +* Thu Aug 14 2008 werner@suse.de +- Update to version 1.1 patchlevel 20080727 +- Use new ncurses ABI 6 which has extend mouse and color support * Thu Apr 10 2008 werner@suse.de - Update to version 1.1 patchlevel 20080316 which includes our shadow patch and is fully compatible with newer ncurses.