- Version update to 1.19.0.4:

* Tons of architecture fixes
  * Testsuite was expanded

- Update to 1.19.0.4:
  * No changes in update-alternatives just match step with dpkg
- Drop patch 0001-In-case-of-equal-priority-rather-update.patch
  * Causes issues on too eagerly regenerating stuff bsc#1075971
  * Reason for this patch should no longer be needed as all python
    packages are singlespec

OBS-URL: https://build.opensuse.org/package/show/system:packagemanager/dpkg?expand=0&rev=60

0001-In-case-of-equal-priority-rather-update.patch

@@ -1,30 +0,0 @@
-From 9f73659ce9b9194ce2f0219afbfb77d27e90508b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
-Date: Wed, 6 Apr 2016 20:06:15 +0200
-Subject: [PATCH] In case of equal priority rather update
-
-This is needed because in some cases priorities in openSUSE python
-packages were equal in priority yet pointing to different files.
-With forced refresh we unfortunately update in some un-needed cases
-but are safe against this kind of errors.
----
- utils/update-alternatives.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/utils/update-alternatives.c b/utils/update-alternatives.c
-index 5dc3213..1af65a4 100644
---- a/utils/update-alternatives.c
-+++ b/utils/update-alternatives.c
-@@ -1437,7 +1437,8 @@ alternative_get_best(struct alternative *a)
- 		best = a->choices;
- 
- 	for (fs = a->choices; fs; fs = fs->next)
--		if (fs->priority > best->priority)
-+                /* In case of equal priority rather use the new alternative */
-+		if (fs->priority >= best->priority)
- 			best = fs;
- 
- 	return best;
--- 
-2.7.4
-

dpkg.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Jan 16 10:56:50 UTC 2018 - tchvatal@suse.com
+
+- Version update to 1.19.0.4:
+  * Tons of architecture fixes
+  * Testsuite was expanded
+
 -------------------------------------------------------------------
 Wed Dec 13 15:55:48 UTC 2017 - mpluskal@suse.com
 

dpkg.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package dpkg
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,23 +17,22 @@
 
 
 Name:           dpkg
-Version:        1.18.23
+Version:        1.19.0.4
 Release:        0
 Summary:        Debian package management system
 License:        GPL-2.0+
 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
-# PATCH-FIX-SUSE: update if two alternatives have same priority bnc#969171
-Patch7:         0001-In-case-of-equal-priority-rather-update.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  gcc-c++
+BuildRequires:  gpg2
 BuildRequires:  libbz2-devel
 BuildRequires:  libmd-devel
 BuildRequires:  libselinux-devel
@@ -88,15 +87,14 @@ Libraries and header files for dpkg.
 %if 0%{?suse_version} == 1315
 %patch2 -p1
 %endif
-%patch7 -p1
 
 %build
 autoreconf -fvi
 export CFLAGS="%{optflags}"
-export SELINUX_LIBS="-lselinux"
+#export SELINUX_LIBS="-lselinux"
 %configure \
     --disable-silent-rules \
-    --with-selinux \
+    --with-libselinux \
     --localstatedir=%{_localstatedir}/lib \
     --with-admindir=%{_localstatedir}/lib/dpkg
 
@@ -122,7 +120,7 @@ sed -i 's/^#define ARCHITECTURE ""/#define ARCHITECTURE "%{debarch}"/' config.h
 make %{?_smp_mflags}
 
 %install
-make install DESTDIR=%{?buildroot}
+%make_install
 
 # remove update-alternatives stuff (included in separate package)
 rm -rf %{buildroot}%{_sysconfdir}/alternatives
@@ -131,6 +129,7 @@ rm -rf %{buildroot}%{_bindir}/update-alternatives
 rm -rf %{buildroot}%{_sbindir}/update-alternatives
 rm -rf %{buildroot}%{_mandir}/man8/update-alternatives.8
 rm -rf %{buildroot}%{_mandir}/*/man8/update-alternatives.8
+rm -rf %{buildroot}%{_datadir}/polkit-1/actions/org.dpkg.pkexec.update-alternatives.policy
 
 # locales
 %find_lang %{name}
@@ -162,7 +161,7 @@ exit 0
 %config(noreplace) %{_sysconfdir}/dpkg/*
 %{_bindir}/*
 %{_sbindir}/*
-%{_libdir}/dpkg
+%{_libexecdir}/dpkg
 %{_datadir}/dpkg
 %{_localstatedir}/lib/dpkg
 %{perl_vendorlib}/Dpkg

dpkg_1.18.23.tar.xz

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

dpkg_1.19.0.4.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:98a66bb19012f9bde848e1e02903fe411dd0b9e61921108ee4323c4167e6990a
+size 4559160

update-alternatives.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Tue Jan 16 10:54:19 UTC 2018 - tchvatal@suse.com
+
+- Update to 1.19.0.4:
+  * No changes in update-alternatives just match step with dpkg
+- Drop patch 0001-In-case-of-equal-priority-rather-update.patch
+  * Causes issues on too eagerly regenerating stuff bsc#1075971
+  * Reason for this patch should no longer be needed as all python
+    packages are singlespec
+
 -------------------------------------------------------------------
 Wed Nov 22 11:06:33 UTC 2017 - dimstar@opensuse.org
 

update-alternatives.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package update-alternatives
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,17 +17,15 @@
 
 
 Name:           update-alternatives
-Version:        1.18.23
+Version:        1.19.0.4
 Release:        0
 Summary:        Maintain symbolic links determining default commands
 License:        GPL-2.0+
 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
-# PATCH-FIX-SUSE: update if two alternatives have same priority bnc#969171
-Patch7:         0001-In-case-of-equal-priority-rather-update.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  libtool
@@ -51,7 +49,6 @@ particular preference.
 %prep
 %setup -q -n dpkg-%{version}
 %patch0 -p1
-%patch7 -p1
 
 %build
 autoreconf -fvi