Accepting request 899017 from system:packagemanager

- do not include update-alternative manpages in dpkg
- use-clamp-from-C-STD-library.patch: removed, upstreamed

- Refresh patches for new version
  * update-alternatives-suse.patch
- Set minimum version for po4a to 0.59 in BuildRequires
- Update file list in %files section
- Version update to 1.20.9 (boo#1181867)
  [ Guillem Jover ]
  * Test suite:
    - Pass --ignore-builtin-builddeps to dpkg-buildpackage.
- from version 1.20.8
  [ Guillem Jover ]
  * start-stop-daemon: Open the --output file in append mode.
  * dpkg: Fix --auto-deconfigure for essential and protected during
    installation. Reported by Julian Andres Klode <jak@debian.org>.
    See #983014.
  * dpkg-realpath: Fix resolution for absolute symlinks on «/».
    Closes: #983855
  * dpkg-realpath: Fix symlink loop tracker.
  * Perl modules:
    - Test::Dpkg: Fix test data path fetching on CPAN.
    - Dpkg::Exit: Preserve exit code in END block.
  * Build system:
    - Group Test::Dpkg changelog entries into “Perl modules” section.
  * Packaging:
    - Run autopkgtest test suites in verbose mode.
  * Test suite:
    - Set PERL in the perl test suite.
    - Use gunzip instead of zcat and assume it might not be present.

OBS-URL: https://build.opensuse.org/request/show/899017
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dpkg?expand=0&rev=33

dpkg.spec

@@ -17,7 +17,7 @@
 
 
 Name:           dpkg
-Version:        1.19.0.5
+Version:        1.20.9
 Release:        0
 Summary:        Debian package management system
 License:        GPL-2.0-or-later
@@ -30,8 +30,6 @@ 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
-# PATCH-FIX-OPENSUSE: Use clamp from C++ STD library.
-Patch4:         use-clamp-from-C-STD-library.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  gcc-c++
@@ -41,7 +39,7 @@ BuildRequires:  libmd-devel
 BuildRequires:  libselinux-devel
 BuildRequires:  libtool
 BuildRequires:  ncurses-devel
-BuildRequires:  po4a
+BuildRequires:  po4a >= 0.59
 BuildRequires:  update-alternatives
 BuildRequires:  xz-devel
 BuildRequires:  zlib-devel
@@ -91,7 +89,6 @@ Libraries and header files for dpkg.
 %patch2 -p1
 %endif
 %patch3 -p1
-%patch4 -p1
 
 %build
 %global _lto_cflags %{_lto_cflags} -ffat-lto-objects
@@ -163,6 +160,8 @@ exit 0
 %doc ABOUT-NLS AUTHORS doc/triggers.txt NEWS README* THANKS TODO debian/changelog
 %{_mandir}/man*/*
 %exclude %{_mandir}/man*/update-alternatives*
+%exclude %{_datadir}/doc/dpkg/*.txt
+%exclude %{_datadir}/doc/dpkg/README*
 %dir %{_sysconfdir}/dpkg
 %config(noreplace) %{_sysconfdir}/dpkg/*
 %{_bindir}/*
@@ -173,9 +172,9 @@ exit 0
 %{perl_vendorlib}/Dpkg
 %{perl_vendorlib}/Dpkg.pm
 %{perl_vendorlib}/Dselect
-%{perl_vendorlib}/Dselect/Ftp.pm
 
 %files devel
+%{_datadir}/aclocal/*.m4
 %{_libdir}/libdpkg.a
 %{_libdir}/libdpkg.la
 %{_libdir}/pkgconfig/libdpkg.pc

dpkg_1.19.0.5.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:818046927a7f77c1bcbbad7d8dbc04cdf0f3e6ec4e1a4f9d313378ecc69d85b5
-size 4557428

dpkg_1.20.9.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5ce242830f213b5620f08e6c4183adb1ef4dc9da28d31988a27c87c71fe534ce
+size 4954428

update-alternatives-suse.patch

@@ -1,43 +1,62 @@
-Index: dpkg-1.18.23/man/update-alternatives.man
+diff -Nru dpkg-1.20.9.orig/man/update-alternatives.pod dpkg-1.20.9/man/update-alternatives.pod
-===================================================================
+--- dpkg-1.20.9.orig/man/update-alternatives.pod	2021-01-30 07:09:02.000000000 +0100
---- dpkg-1.18.23.orig/man/update-alternatives.man
++++ dpkg-1.20.9/man/update-alternatives.pod	2021-04-28 11:43:20.093959620 +0200
-+++ dpkg-1.18.23/man/update-alternatives.man
+@@ -37,7 +37,7 @@
-@@ -34,7 +34,7 @@ update\-alternatives \- maintain symboli
+ 
- .SH DESCRIPTION
+ B<update-alternatives>
- .B update\-alternatives
  creates, removes, maintains and displays information about the symbolic
 -links comprising the Debian alternatives system.
 +links comprising the SUSE alternatives system.
- .PP
+ 
  It is possible for several programs fulfilling the same or similar
  functions to be installed on a single system at the same time.
-@@ -44,7 +44,7 @@ different editor, if desired, but makes
+@@ -47,7 +47,7 @@
  to make a good choice for an editor to invoke if the
  user has not specified a particular preference.
- .PP
+ 
 -Debian's alternatives system aims to solve this problem.
 +SUSE's alternatives system aims to solve this problem.
  A generic name in the filesystem is
  shared by all files providing interchangeable functionality.
  The alternatives system and the system administrator
-@@ -83,10 +83,10 @@ installed, changed or removed,
+@@ -85,8 +85,8 @@
+ B<update-alternatives>
  is called to update information about that file in the alternatives system.
- .B update\-alternatives
+ B<update-alternatives>
- is usually called from the
+-is usually called from the following Debian package maintainer scripts,
--.B postinst
+-B<postinst>
-+.B post
++is usually called from the following SUSE package maintainer scripts,
- (configure) or
++B<post>
- .B prerm
+ (configure) to install the alternative and from
--(remove and deconfigure) scripts in Debian packages.
+ B<prerm> and B<postrm>
-+(remove and deconfigure) scripts in SUSE packages.
+ (remove) to remove the alternative.
- .PP
+diff -Nru dpkg-1.20.9.orig/utils/Makefile.am dpkg-1.20.9/utils/Makefile.am
- It is often useful for a number of alternatives to be synchronized,
+--- dpkg-1.20.9.orig/utils/Makefile.am	2021-01-30 07:09:02.000000000 +0100
- so that they are changed as a group; for example, when several versions
++++ dpkg-1.20.9/utils/Makefile.am	2021-04-28 11:44:41.674722417 +0200
-Index: dpkg-1.18.23/utils/update-alternatives.c
+@@ -45,8 +45,8 @@
-===================================================================
+ 
---- dpkg-1.18.23.orig/utils/update-alternatives.c
+ update_alternatives_CPPFLAGS = \
-+++ dpkg-1.18.23/utils/update-alternatives.c
+ 	-DALT_TMP_EXT=\".dpkg-tmp\" \
-@@ -70,7 +70,7 @@ static int opt_force = 0;
+-	-DADMINDIR_ENVVAR=\"DPKG_ADMINDIR\" \
+-	-DINSTDIR_ENVVAR=\"DPKG_ROOT\" \
++	-DADMINDIR_ENVVAR=\"RPM_ADMINDIR\" \
++	-DINSTDIR_ENVVAR=\"RPM_ROOT\" \
+ 	$(AM_CPPFLAGS)
+ 
+ update_alternatives_LDADD = \
+@@ -79,7 +79,7 @@
+ uninstall-local:
+ 	rm -f $(DESTDIR)$(sysconfdir)/alternatives/README
+ 
+-TEST_ENV_VARS = DPKG_DATADIR=$(top_srcdir)/data
++TEST_ENV_VARS = RPM_DATADIR=$(top_srcdir)/data
+ 
+ test_tmpdir = t.tmp
+ test_scripts = \
+diff -Nru dpkg-1.20.9.orig/utils/update-alternatives.c dpkg-1.20.9/utils/update-alternatives.c
+--- dpkg-1.20.9.orig/utils/update-alternatives.c	2021-03-02 03:15:25.000000000 +0100
++++ dpkg-1.20.9/utils/update-alternatives.c	2021-04-28 11:43:44.998192415 +0200
+@@ -115,7 +115,7 @@
  static void
  version(void)
  {
@@ -46,18 +65,3 @@ Index: dpkg-1.18.23/utils/update-alternatives.c
  	printf("\n");
  
  	printf(_(
-Index: dpkg-1.18.23/utils/Makefile.am
-===================================================================
---- dpkg-1.18.23.orig/utils/Makefile.am
-+++ dpkg-1.18.23/utils/Makefile.am
-@@ -25,8 +25,8 @@ update_alternatives_SOURCES = \
- 	update-alternatives.c
- 
- update_alternatives_CPPFLAGS = \
--	-DALT_TMP_EXT=\".dpkg-tmp\" \
--	-DADMINDIR_ENVVAR=\"DPKG_ADMINDIR\" \
-+	-DALT_TMP_EXT=\".rpm-tmp\" \
-+	-DADMINDIR_ENVVAR=\"RPM_ADMINDIR\" \
- 	$(AM_CPPFLAGS)
- 
- update_alternatives_LDADD = \

update-alternatives.spec

@@ -17,7 +17,7 @@
 
 
 Name:           update-alternatives
-Version:        1.19.0.5
+Version:        1.20.9
 Release:        0
 Summary:        Maintain symbolic links determining default commands
 License:        GPL-2.0-or-later

use-clamp-from-C-STD-library.patch

@@ -1,33 +0,0 @@
-From 43bf69b419bcfc0c601015d753b921b6849bae06 Mon Sep 17 00:00:00 2001
-From: Martin Liska <mliska@suse.cz>
-Date: Fri, 23 Apr 2021 11:03:59 +0200
-Subject: [PATCH] Use clamp from C++ STD library.
-
----
- lib/dpkg/macros.h | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/lib/dpkg/macros.h b/lib/dpkg/macros.h
-index 0c1937a..34387d9 100644
---- a/lib/dpkg/macros.h
-+++ b/lib/dpkg/macros.h
-@@ -112,7 +112,6 @@
- #ifndef max
- #define max(a, b) ((a) > (b) ? (a) : (b))
- #endif
--#endif
- 
- /**
-  * @def clamp
-@@ -127,6 +126,8 @@
- #define clamp(v, l, h) ((v) > (h) ? (h) : ((v) < (l) ? (l) : (v)))
- #endif
- 
-+#endif
-+
- /** @} */
- 
- #endif /* LIBDPKG_MACROS_H */
--- 
-2.31.1
-