Accepting request 556757 from system:packagemanager

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

dpkg.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Wed Dec 13 15:55:48 UTC 2017 - mpluskal@suse.com
+
+- Update test dependencies
+- Build localised manpages
+
+-------------------------------------------------------------------
+Sat Dec  9 09:03:19 UTC 2017 - kkaempf@suse.com
+
+- fix Leap 42.2,42.3 build: add drop-tar-option.patch
+
 -------------------------------------------------------------------
 Wed Nov  8 16:15:47 UTC 2017 - mpluskal@suse.com
 

dpkg.spec

@@ -22,11 +22,13 @@ 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
@@ -37,17 +39,19 @@ BuildRequires:  libmd-devel
 BuildRequires:  libselinux-devel
 BuildRequires:  libtool
 BuildRequires:  ncurses-devel
+BuildRequires:  po4a
 BuildRequires:  update-alternatives
 BuildRequires:  xz-devel
 BuildRequires:  zlib-devel
 BuildRequires:  perl(Date::Parse)
 BuildRequires:  perl(IO::String)
+BuildRequires:  perl(Test::Pod)
+BuildRequires:  perl(Test::Strict)
 Requires:       cpio
 Requires:       make
 Requires:       patch
 Requires:       update-alternatives
 Requires:       perl(Date::Parse)
-%{perl_requires}
 Requires(post): coreutils
 Recommends:     perl(File::FcntlLock)
 Provides:       deb = %{version}
@@ -55,6 +59,7 @@ Obsoletes:      deb < %{version}
 Provides:       dpkg-dev = %{version}
 Provides:       dpkg-doc = %{version}
 Provides:       dselect = %{version}
+%{perl_requires}
 
 %description
 This package contains tools for working with Debian packages. It makes
@@ -80,6 +85,9 @@ Libraries and header files for dpkg.
 %prep
 %setup -q
 %patch1 -p1
+%if 0%{?suse_version} == 1315
+%patch2 -p1
+%endif
 %patch7 -p1
 
 %build
@@ -144,6 +152,7 @@ done
 exit 0
 
 %files lang -f %{name}.lang
+%{_mandir}/??/man*/*
 
 %files
 %doc ABOUT-NLS AUTHORS COPYING doc/triggers.txt NEWS README* THANKS TODO debian/changelog

drop-tar-option.patch

@@ -0,0 +1,14 @@
+diff -ruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-dpkg-1.18.23/scripts/Dpkg/Source/Archive.pm ./scripts/Dpkg/Source/Archive.pm
+--- ../orig-dpkg-1.18.23/scripts/Dpkg/Source/Archive.pm	2017-02-22 22:50:39.000000000 +0100
++++ ./scripts/Dpkg/Source/Archive.pm	2017-12-09 09:59:34.985938649 +0100
+@@ -51,8 +51,8 @@
+     my $mtime = $opts{source_date} // $ENV{SOURCE_DATE_EPOCH} || time;
+     # Call tar creation process
+     $spawn_opts{delete_env} = [ 'TAR_OPTIONS' ];
+-    $spawn_opts{exec} = [ $Dpkg::PROGTAR, '-cf', '-', '--format=gnu', '--sort=name',
+-                          '--mtime', "\@$mtime", '--clamp-mtime', '--null',
++    $spawn_opts{exec} = [ $Dpkg::PROGTAR, '-cf', '-', '--format=gnu',
++                          '--mtime', "\@$mtime", '--null',
+                           '--numeric-owner', '--owner=0', '--group=0',
+                           @{$opts{options}}, '-T', '-' ];
+     *$self->{pid} = spawn(%spawn_opts);

update-alternatives.spec

@@ -81,7 +81,7 @@ if [ -d var/lib/rpm/alternatives ]; then
   # We proceed even if no alternatives directory exists, such situation
   # occurs in buildroot environment (we can't buildrequire package
   # itself).
-  mv -f var/lib/rpm/alternatives/* /var/lib/alternatives/ || :
+  mv -f var/lib/rpm/alternatives/* %{_localstatedir}/lib/alternatives/ || :
   rmdir var/lib/rpm/alternatives ||:
 fi