commit dialog for openSUSE:Factory

30 Nov 2023

Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package dialog for openSUSE:Factory checked in at 2023-11-30 21:59:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/dialog (Old)
 and      /work/SRC/openSUSE:Factory/.dialog.new.25432 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "dialog"

Thu Nov 30 21:59:45 2023 rev:42 rq:1129827 version:1.3

Changes:
--------

--- /work/SRC/openSUSE:Factory/dialog/dialog.changes	2023-06-21 22:37:10.985404865 +0200
+++ /work/SRC/openSUSE:Factory/.dialog.new.25432/dialog.changes	2023-11-30 22:00:42.047688384 +0100
@@ -1,0 +2,6 @@
+Thu Nov 23 09:54:41 UTC 2023 - Ludwig Nussel <lnussel@suse.com>
+
+- don't install config file, dialog has built in defaults anyway
+- add support for /usr/etc (dialog-1.3-usretc.diff)
+
+-------------------------------------------------------------------

Old:
----
  dialog.rc

New:
----
  dialog-1.3-usretc.diff

BETA DEBUG BEGIN:
  New:- don't install config file, dialog has built in defaults anyway
- add support for /usr/etc (dialog-1.3-usretc.diff)
BETA DEBUG END:

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ dialog.spec ++++++
--- /var/tmp/diff_new_pack.PV2CuK/_old	2023-11-30 22:00:43.503742023 +0100
+++ /var/tmp/diff_new_pack.PV2CuK/_new	2023-11-30 22:00:43.507742171 +0100
@@ -28,11 +28,11 @@
 Source0:        https://www.invisible-island.net/archives/%{name}/%{name}-%{version}-%{src_date}.tgz
 Source1:        https://www.invisible-island.net/archives/%{name}/%{name}-%{version}-%{src_date}.tgz.asc
 Source2:        %{name}.keyring
-Source3:        dialog.rc
 Source4:        dialog-rpmlintrc
 # PATCH-FIX-OPENSUSE : fix shadow during resizing terminal
 Patch0:         dialog-1.2-20121230.dif
 Patch2:         dialog-gcc-warnings.patch
+Patch3:         dialog-1.3-usretc.diff
 BuildRequires:  libtool
 BuildRequires:  ncurses-devel
 BuildRequires:  pkgconfig
@@ -69,9 +69,7 @@
 %lang_package
 
 %prep
-%setup -q -n %{name}-%{version}-%{src_date}
-%patch0
-%patch2 -p1
+%autosetup -n %{name}-%{version}-%{src_date}
 
 %build
     CC=gcc
@@ -113,7 +111,7 @@
 rm -rf %{buildroot}%{_datadir}/locale/rm/ # Rhaeto-Romance
 
 mkdir %{buildroot}/etc
-install -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/dialogrc
+> %{buildroot}%{_sysconfdir}/dialogrc
 %find_lang %{name}
 xz CHANGES
 
@@ -128,7 +126,7 @@
 %else
 %doc CHANGES.xz README VERSION COPYING
 %endif
-%config(noreplace) %{_sysconfdir}/dialogrc
+%ghost %config(noreplace) %{_sysconfdir}/dialogrc
 %{_bindir}/dialog
 %{_mandir}/man1/dialog.1%{ext_man}
 

++++++ dialog-1.2-20121230.dif ++++++
--- /var/tmp/diff_new_pack.PV2CuK/_old	2023-11-30 22:00:43.523742760 +0100
+++ /var/tmp/diff_new_pack.PV2CuK/_new	2023-11-30 22:00:43.527742907 +0100
@@ -1,7 +1,7 @@
-Index: util.c
+Index: dialog-1.3-20230209/util.c
 ===================================================================
---- util.c.orig
-+++ util.c
+--- dialog-1.3-20230209.orig/util.c
++++ dialog-1.3-20230209/util.c
 @@ -2406,8 +2406,10 @@ dlg_move_window(WINDOW *win, int height,
  #ifdef HAVE_COLOR
  	    if (p->shadow != 0) {


++++++ dialog-1.3-usretc.diff ++++++
Index: dialog-1.3-20230209/rc.c
===================================================================
--- dialog-1.3-20230209.orig/rc.c
+++ dialog-1.3-20230209/rc.c
@@ -576,8 +576,11 @@ dlg_parse_rc(void)
     if (rc_file == NULL) {	/* step (b) failed? */
 	/* try step (c) */
 	strcpy(str, GLOBALRC);
-	if ((rc_file = fopen(filename = str, "rt")) == NULL)
-	    return 0;		/* step (c) failed, use default values */
+	if ((rc_file = fopen(filename = str, "rt")) == NULL) {
+	      sprintf(str, "/usr/%s", GLOBALRC);
+	      if ((rc_file = fopen(filename = str, "rt")) == NULL)
+		  return 0;		/* step (c) failed, use default values */
+	}
     }
 
     DLG_TRACE(("# opened rc file \"%s\"\n", filename));

    

Source-Sync

tags

participants (1)