Hello community,
here is the log from the commit of package dialog for openSUSE:Factory checked in at 2013-03-08 10:49:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/dialog (Old)
and /work/SRC/openSUSE:Factory/.dialog.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dialog", Maintainer is "werner@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/dialog/dialog.changes 2013-02-01 19:14:27.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.dialog.new/dialog.changes 2013-03-08 10:49:05.000000000 +0100
@@ -1,0 +2,20 @@
+Thu Feb 28 11:09:22 UTC 2013 - werner@suse.de
+
+- Re-add patch dialog-1.2-20121230.dif: Fix problem with moving
+ shadows during terminal resize
+- Use a /etc/dialogrc for openSUSE default coloring/shadow defaults
+- Re-add Korean language message file
+
+-------------------------------------------------------------------
+Fri Feb 22 22:20:50 UTC 2013 - dmitry_r@opensuse.org
+
+- Update to version 1.2-20121230
+ * See included CHANGES file for detailes
+
+-------------------------------------------------------------------
+Fri Feb 22 22:01:06 UTC 2013 - dmitry_r@opensuse.org
+
+- Fix libraries
+ * dialog-libs.patch
+
+-------------------------------------------------------------------
Old:
----
dialog-1.1-20080727.dif
dialog-1.1-20080727.tar.bz2
New:
----
dialog-1.2-20121230.dif
dialog-1.2-20121230.tgz
dialog-gcc-warnings.patch
dialog-libs.patch
dialog.rc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dialog.spec ++++++
--- /var/tmp/diff_new_pack.o00yne/_old 2013-03-08 10:49:06.000000000 +0100
+++ /var/tmp/diff_new_pack.o00yne/_new 2013-03-08 10:49:06.000000000 +0100
@@ -18,18 +18,22 @@
Name: dialog
Url: http://invisible-island.net/dialog/
-Version: 1.1
+Version: 1.2
Release: 0
-%define somajor 6
+%define src_date 20121230
+%define somajor 11
Summary: Menus and Input Boxes for Shell Scripts
License: LGPL-2.1
Group: Development/Tools/Other
-Source: dialog-1.1-20080727.tar.bz2
-Source1: dialog.ko.po.bz2
-Patch: dialog-1.1-20080727.dif
+Source: ftp://invisible-island.net/dialog/%{name}-%{version}-%{src_date}.tgz
+Source1: dialog.rc
+Source2: dialog.ko.po.bz2
+# PATCH-FIX-OPENSUSE : fix shadow during resizing terminal
+Patch0: dialog-1.2-20121230.dif
+Patch1: dialog-libs.patch
+Patch2: dialog-gcc-warnings.patch
BuildRequires: libtool
BuildRequires: ncurses-devel
-#BuildRequires: gpm
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -50,10 +54,22 @@
%description devel
This program lets you use menus and dialog boxes in shell scripts.
+%package examples
+Summary: Examples of using dialog tool
+Group: Development/Libraries/Other
+Requires: %{name} = %{version}
+BuildArch: noarch
+
+%description examples
+Examples of using menus and dialog boxes in shell scripts.
+
%prep
-%setup -n dialog-1.1-20080727
-bzcat %{S:1} > po/ko.po
-%patch
+%setup -n %{name}-%{version}-%{src_date}
+bzcat %{S:2} > po/ko.po
+%patch0 -p0
+%patch1 -p1
+%patch2 -p1
+chmod -x samples/*
%build
CC=gcc
@@ -68,13 +84,16 @@
break
done
export CC LIBS CFLAGS
+
%configure \
--enable-nls \
--enable-included-msgs \
--enable-widec \
--with-ncursesw \
--with-libtool \
+ --disable-rpath-hack \
--includedir=%{_includedir}/dialog
+
make %{?_smp_mflags}
%install
@@ -85,6 +104,9 @@
rm -rf %{buildroot}%{_datadir}/locale/mg/ # Malagasy (Malayalam??)
rm -rf %{buildroot}%{_datadir}/locale/rm/ # Rhaeto-Romance
+
+mkdir %{buildroot}/etc
+install -m 0644 %{S:1} %{buildroot}/etc/dialogrc
%find_lang %name
%post -n libdialog%{somajor} -p /sbin/ldconfig
@@ -94,6 +116,7 @@
%files -f %name.lang
%defattr(-,root,root)
%doc CHANGES README VERSION COPYING
+%config(noreplace) /etc/dialogrc
%{_bindir}/dialog
%{_mandir}/man1/dialog.1.gz
@@ -108,4 +131,8 @@
%{_includedir}/dialog/
%{_mandir}/man3/dialog.3.gz
+%files examples
+%defattr(-,root,root)
+%doc samples/*
+
%changelog
++++++ dialog-1.1-20080727.dif -> dialog-1.2-20121230.dif ++++++
--- /work/SRC/openSUSE:Factory/dialog/dialog-1.1-20080727.dif 2011-09-23 01:55:09.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.dialog.new/dialog-1.2-20121230.dif 2013-03-08 10:49:05.000000000 +0100
@@ -1,118 +1,6 @@
---- dialog.h
-+++ dialog.h 2008-04-10 13:28:27.840374000 +0200
-@@ -38,6 +38,23 @@
- #include
- #include /* fork() etc. */
- #include /* sqrt() */
-+#include /* struct winsize */
-+
-+#ifndef GCC_NORETURN
-+#if defined(__GNUC__)
-+#define GCC_NORETURN __attribute__((noreturn))
-+#else
-+#define GCC_NORETURN /*nothing*/
-+#endif
-+#endif
-+
-+#ifndef GCC_UNUSED
-+#if defined(__GNUC__)
-+#define GCC_UNUSED __attribute__((unused))
-+#else
-+#define GCC_UNUSED /*nothing*/
-+#endif
-+#endif
-
- #if defined(HAVE_NCURSESW_NCURSES_H)
- #include
-@@ -71,14 +88,6 @@
- #define _(s) s
- #endif
-
--#ifndef GCC_NORETURN
--#define GCC_NORETURN /*nothing*/
--#endif
--
--#ifndef GCC_UNUSED
--#define GCC_UNUSED /*nothing*/
--#endif
--
- #ifndef HAVE_WGET_WCH
- #undef USE_WIDE_CURSES
- #endif
---- dlg_colors.h
-+++ dlg_colors.h 2006-07-10 14:42:18.000000000 +0200
-@@ -42,13 +42,13 @@
-
- #define DLGC_FG_SHADOW COLOR_BLACK
- #define DLGC_BG_SHADOW COLOR_BLACK
--#define DLGC_HL_SHADOW TRUE
-+#define DLGC_HL_SHADOW FALSE
-
- #define DLGC_FG_DIALOG COLOR_BLACK
- #define DLGC_BG_DIALOG COLOR_WHITE
- #define DLGC_HL_DIALOG FALSE
-
--#define DLGC_FG_TITLE COLOR_BLUE
-+#define DLGC_FG_TITLE COLOR_YELLOW
- #define DLGC_BG_TITLE COLOR_WHITE
- #define DLGC_HL_TITLE TRUE
-
-@@ -96,7 +96,7 @@
- #define DLGC_BG_SEARCHBOX COLOR_WHITE
- #define DLGC_HL_SEARCHBOX FALSE
-
--#define DLGC_FG_SEARCHBOX_TITLE COLOR_BLUE
-+#define DLGC_FG_SEARCHBOX_TITLE COLOR_YELLOW
- #define DLGC_BG_SEARCHBOX_TITLE COLOR_WHITE
- #define DLGC_HL_SEARCHBOX_TITLE TRUE
-
-@@ -104,7 +104,7 @@
- #define DLGC_BG_SEARCHBOX_BORDER COLOR_WHITE
- #define DLGC_HL_SEARCHBOX_BORDER TRUE
-
--#define DLGC_FG_POSITION_INDICATOR COLOR_BLUE
-+#define DLGC_FG_POSITION_INDICATOR COLOR_YELLOW
- #define DLGC_BG_POSITION_INDICATOR COLOR_WHITE
- #define DLGC_HL_POSITION_INDICATOR TRUE
-
-@@ -124,7 +124,7 @@
- #define DLGC_BG_ITEM_SELECTED COLOR_BLUE
- #define DLGC_HL_ITEM_SELECTED TRUE
-
--#define DLGC_FG_TAG COLOR_BLUE
-+#define DLGC_FG_TAG COLOR_YELLOW
- #define DLGC_BG_TAG COLOR_WHITE
- #define DLGC_HL_TAG TRUE
-
---- guage.c
-+++ guage.c 2008-04-10 12:53:27.303792000 +0200
-@@ -229,7 +229,7 @@ dialog_gauge(const char *title,
- #endif
-
- fclose(dialog_state.pipe_input);
-- dialog_state.pipe_input = 0;
-+ dialog_state.pipe_input = (FILE*)0;
-
- curs_set(1);
- dlg_del_window(dialog);
--- util.c
-+++ 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) {
- if (dialog_state.pipe_input != stdin) {
- fclose(dialog_state.pipe_input);
-- dialog_state.pipe_input = 0;
-+ dialog_state.pipe_input = (FILE*)0;
- }
- }
- _exit(code);
-@@ -1520,8 +1520,10 @@ dlg_move_window(WINDOW *win, int height,
++++ util.c 2013-02-28 11:09:24.466267899 +0100
+@@ -2112,8 +2112,10 @@ dlg_move_window(WINDOW *win, int height,
#ifdef HAVE_COLOR
if (p->shadow != 0) {
if (dialog_state.use_shadow) {
++++++ dialog-gcc-warnings.patch ++++++
Index: dialog-1.2-20121230/dialog.h
===================================================================
--- dialog-1.2-20121230.orig/dialog.h
+++ dialog-1.2-20121230/dialog.h
@@ -43,6 +43,23 @@
#include
#include /* fork() etc. */
#include /* sqrt() */
+#include /* struct winsize */
+
+#ifndef GCC_NORETURN
+#if defined(__GNUC__)
+#define GCC_NORETURN __attribute__((noreturn))
+#else
+#define GCC_NORETURN /*nothing*/
+#endif
+#endif
+
+#ifndef GCC_UNUSED
+#if defined(__GNUC__)
+#define GCC_UNUSED __attribute__((unused))
+#else
+#define GCC_UNUSED /*nothing*/
+#endif
+#endif
/* header conflict with Solaris xpg4 versus */
#if defined(ERR) && (ERR == 13)
@@ -99,14 +116,6 @@
#define GCC_PRINTFLIKE(fmt,var) /*nothing*/
#endif
-#ifndef GCC_NORETURN
-#define GCC_NORETURN /*nothing*/
-#endif
-
-#ifndef GCC_UNUSED
-#define GCC_UNUSED /*nothing*/
-#endif
-
#ifndef HAVE_WGET_WCH
#undef USE_WIDE_CURSES
#endif
++++++ dialog-libs.patch ++++++
Index: dialog-1.2-20121230/makefile.in
===================================================================
--- dialog-1.2-20121230.orig/makefile.in
+++ dialog-1.2-20121230/makefile.in
@@ -179,11 +179,11 @@ dialog$o \
$(OBJECTS) : $(srcdir)/dialog.h $(srcdir)/dlg_keys.h dlg_config.h VERSION
$(LIB) : $(LIB_OBJECT)
- $(LIBTOOL_CREATE) $(LIB) $(LIB_OBJECT)
+ $(LIBTOOL_CREATE) $(LIB) $(LIB_OBJECT) $(LIBS)
$(RANLIB) $@
$(PROG)$x : $(LIB) dialog$o @INTLDIR_MAKE@ @INTLLIBS@
- $(LINK) -o $@ dialog$o -L. -l@PACKAGE@ $(LDFLAGS) $(LIBS)
+ $(LINK) -o $@ dialog$o -L. -l@PACKAGE@ $(LDFLAGS)
clean \
distclean \
++++++ dialog.rc ++++++
#
# Run-time configuration file for dialog, matches openSuSE color scheme.
#
# Types of values:
#
# Number - <number>
# String - "string"
# Boolean -
# Attribute - (foreground,background,highlight?)
# Set aspect-ration.
aspect = 0
# Set separator (for multiple widgets output).
separate_widget = ""
# Set tab-length (for textbox tab-conversion).
tab_len = 8
# Make tab-traversal for checklist, etc., include the list.
visit_items = OFF
# Shadow dialog boxes? This also turns on color.
use_shadow = ON
# Turn color support ON or OFF
use_colors = ON
# Screen color
screen_color = (CYAN,BLUE,ON)
# Shadow color
shadow_color = (BLACK,BLACK,ON)
# Dialog box color
dialog_color = (BLACK,WHITE,OFF)
# Dialog box title color
title_color = (YELLOW,WHITE,ON)
# Dialog box border color
border_color = (WHITE,WHITE,ON)
# Active button color
button_active_color = (WHITE,BLUE,ON)
# Inactive button color
button_inactive_color = dialog_color
# Active button key color
button_key_active_color = button_active_color
# Inactive button key color
button_key_inactive_color = (RED,WHITE,OFF)
# Active button label color
button_label_active_color = (YELLOW,BLUE,ON)
# Inactive button label color
button_label_inactive_color = (BLACK,WHITE,ON)
# Input box color
inputbox_color = dialog_color
# Input box border color
inputbox_border_color = dialog_color
# Search box color
searchbox_color = dialog_color
# Search box title color
searchbox_title_color = title_color
# Search box border color
searchbox_border_color = border_color
# File position indicator color
position_indicator_color = title_color
# Menu box color
menubox_color = dialog_color
# Menu box border color
menubox_border_color = border_color
# Item color
item_color = dialog_color
# Selected item color
item_selected_color = button_active_color
# Tag color
tag_color = title_color
# Selected tag color
tag_selected_color = button_label_active_color
# Tag key color
tag_key_color = button_key_inactive_color
# Selected tag key color
tag_key_selected_color = (RED,BLUE,ON)
# Check box color
check_color = dialog_color
# Selected check box color
check_selected_color = button_active_color
# Up arrow color
uarrow_color = (GREEN,WHITE,ON)
# Down arrow color
darrow_color = uarrow_color
# Item help-text color
itemhelp_color = (WHITE,BLACK,OFF)
# Active form text color
form_active_text_color = button_active_color
# Form text color
form_text_color = (WHITE,CYAN,ON)
# Readonly form item color
form_item_readonly_color = (CYAN,WHITE,ON)
# Dialog box gauge color
gauge_color = (BLUE,WHITE,ON)
# Dialog box border2 color
border2_color = dialog_color
# Input box border2 color
inputbox_border2_color = dialog_color
# Search box border2 color
searchbox_border2_color = dialog_color
# Menu box border2 color
menubox_border2_color = dialog_color
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org