From 7083d465c9964f210fb97002345fdae4caaa5c09cbcc13b3e228940af7c39c8a Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Thu, 28 Feb 2013 11:18:27 +0000 Subject: [PATCH] . OBS-URL: https://build.opensuse.org/package/show/Base:System/dialog?expand=0&rev=21 --- dialog-1.2-20121230.dif | 13 ++++ dialog.changes | 8 +++ dialog.ko.po.bz2 | 3 + dialog.rc | 141 ++++++++++++++++++++++++++++++++++++++++ dialog.spec | 11 ++++ 5 files changed, 176 insertions(+) create mode 100644 dialog-1.2-20121230.dif create mode 100644 dialog.ko.po.bz2 create mode 100644 dialog.rc diff --git a/dialog-1.2-20121230.dif b/dialog-1.2-20121230.dif new file mode 100644 index 0000000..7be1d42 --- /dev/null +++ b/dialog-1.2-20121230.dif @@ -0,0 +1,13 @@ +--- util.c ++++ 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) { ++ (void) wresize(p->shadow, height, width); + (void) mvwin(p->shadow, y + SHADOW_ROWS, x + SHADOW_COLS); + } else { ++ delwin(p->shadow); + p->shadow = 0; + } + } diff --git a/dialog.changes b/dialog.changes index b22e863..c263ab9 100644 --- a/dialog.changes +++ b/dialog.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +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 diff --git a/dialog.ko.po.bz2 b/dialog.ko.po.bz2 new file mode 100644 index 0000000..d9c30fd --- /dev/null +++ b/dialog.ko.po.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0f81ee4f183791b0bb4ad09534ffc702da31c6d1de8e6aa098388932df11ae0a +size 572 diff --git a/dialog.rc b/dialog.rc new file mode 100644 index 0000000..15f952c --- /dev/null +++ b/dialog.rc @@ -0,0 +1,141 @@ +# +# Run-time configuration file for dialog, matches openSuSE color scheme. +# +# Types of values: +# +# 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 diff --git a/dialog.spec b/dialog.spec index 8155fb0..8ddb929 100644 --- a/dialog.spec +++ b/dialog.spec @@ -26,6 +26,10 @@ Summary: Menus and Input Boxes for Shell Scripts License: LGPL-2.1 Group: Development/Tools/Other 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 @@ -61,6 +65,8 @@ Examples of using menus and dialog boxes in shell scripts. %prep %setup -n %{name}-%{version}-%{src_date} +bzcat %{S:2} > po/ko.po +%patch0 -p0 %patch1 -p1 %patch2 -p1 chmod -x samples/* @@ -85,6 +91,7 @@ chmod -x samples/* --enable-widec \ --with-ncursesw \ --with-libtool \ + --disable-rpath-hack \ --includedir=%{_includedir}/dialog make %{?_smp_mflags} @@ -97,6 +104,9 @@ find %{buildroot}%{_libdir} -name '*.a' -type f -delete -print 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 @@ -106,6 +116,7 @@ rm -rf %{buildroot}%{_datadir}/locale/rm/ # Rhaeto-Romance %files -f %name.lang %defattr(-,root,root) %doc CHANGES README VERSION COPYING +%config(noreplace) /etc/dialogrc %{_bindir}/dialog %{_mandir}/man1/dialog.1.gz