From e1ad218e08064ad8689a938078414c351ed9fd2429939a3e3d24ee86ed0a6d7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 25 Aug 2020 14:53:21 +0000 Subject: [PATCH] Accepting request 829570 from home:marxin:branches:system:packagemanager - Add ncurses-fix.patch in order to fix ncurses issue. OBS-URL: https://build.opensuse.org/request/show/829570 OBS-URL: https://build.opensuse.org/package/show/system:packagemanager/dpkg?expand=0&rev=75 --- dpkg.changes | 5 +++++ dpkg.spec | 6 ++++-- ncurses-fix.patch | 9 +++++++++ update-alternatives.spec | 4 ++-- 4 files changed, 20 insertions(+), 4 deletions(-) create mode 100644 ncurses-fix.patch diff --git a/dpkg.changes b/dpkg.changes index ab48328..4b6ad79 100644 --- a/dpkg.changes +++ b/dpkg.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Aug 25 13:39:24 UTC 2020 - Martin Liška + +- Add ncurses-fix.patch in order to fix ncurses issue. + ------------------------------------------------------------------- Fri Aug 2 06:58:54 UTC 2019 - Martin Liška diff --git a/dpkg.spec b/dpkg.spec index 2efcd16..ce76baa 100644 --- a/dpkg.spec +++ b/dpkg.spec @@ -1,7 +1,7 @@ # # spec file for package dpkg # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,13 +22,14 @@ Release: 0 Summary: Debian package management system License: GPL-2.0-or-later Group: System/Packages -Url: http://www.debian.org +URL: http://www.debian.org Source0: http://ftp.de.debian.org/debian/pool/main/d/dpkg/dpkg_%{version}.tar.xz Source3: sensible-editor # PATCH-FIX-OPENSUSE replace debian with opensuse. replace macros. update-alternatives temp directories' path and name from dpkg* to rpm*. Patch1: update-alternatives-suse.patch # PATCH-FIX-SUSE: tar of Leap 42.{2,3} does not recognize --sort=name, --clamp-mtime options Patch2: drop-tar-option.patch +Patch3: ncurses-fix.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: gcc-c++ @@ -87,6 +88,7 @@ Libraries and header files for dpkg. %if 0%{?suse_version} == 1315 %patch2 -p1 %endif +%patch3 -p1 %build %global _lto_cflags %{_lto_cflags} -ffat-lto-objects diff --git a/ncurses-fix.patch b/ncurses-fix.patch new file mode 100644 index 0000000..c2b523e --- /dev/null +++ b/ncurses-fix.patch @@ -0,0 +1,9 @@ +diff --git a/dselect/keyoverride b/dselect/keyoverride +index 35967ff..91a8c0c 100644 +--- a/dselect/keyoverride ++++ b/dselect/keyoverride +@@ -56,3 +56,4 @@ KEY_SRIGHT Shift Right + KEY_SPREVIOUS Shift Previous + KEY_MAX [elide] + KEY_MIN [elide] ++KEY_EVENT [elide] diff --git a/update-alternatives.spec b/update-alternatives.spec index c4fdc7d..273f71c 100644 --- a/update-alternatives.spec +++ b/update-alternatives.spec @@ -1,7 +1,7 @@ # # spec file for package update-alternatives # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,7 +22,7 @@ Release: 0 Summary: Maintain symbolic links determining default commands License: GPL-2.0-or-later Group: System/Management -Url: http://ftp.de.debian.org/debian/pool/main/d/dpkg/ +URL: http://ftp.de.debian.org/debian/pool/main/d/dpkg/ Source0: http://ftp.de.debian.org/debian/pool/main/d/dpkg/dpkg_%{version}.tar.xz Source3: sensible-editor Patch0: update-alternatives-suse.patch