diff --git a/dpkg.changes b/dpkg.changes index 9c19474..d6a1455 100644 --- a/dpkg.changes +++ b/dpkg.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/dpkg.spec b/dpkg.spec index 487d5ee..2d7bc15 100644 --- a/dpkg.spec +++ b/dpkg.spec @@ -27,6 +27,8 @@ Source0: http://ftp.de.debian.org/debian/pool/main/d/dpkg/dpkg_%{version} 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 @@ -80,6 +82,9 @@ Libraries and header files for dpkg. %prep %setup -q %patch1 -p1 +%if 0%{?suse_version} == 1315 +%patch2 -p1 +%endif %patch7 -p1 %build diff --git a/drop-tar-option.patch b/drop-tar-option.patch new file mode 100644 index 0000000..10905ec --- /dev/null +++ b/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); diff --git a/update-alternatives.spec b/update-alternatives.spec index 228e2d0..36b8fa9 100644 --- a/update-alternatives.spec +++ b/update-alternatives.spec @@ -22,7 +22,7 @@ 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