testing/dpkg
SHA256
3
0
Fork 0
forked from pool/dpkg
Code Pull Requests Activity

Accepting request 555504 from CrossToolchain:avr

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/555504
OBS-URL: https://build.opensuse.org/package/show/system:packagemanager/dpkg?expand=0&rev=57
This commit is contained in:
Tomáš Chvátal 2017-12-11 09:54:46 +00:00 committed by Git OBS Bridge
parent 5cf1016a45
commit 0d1473e699
4 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dpkg.changes
View File

@ -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 Wed Nov 8 16:15:47 UTC 2017 - mpluskal@suse.com

5
dpkg.spec
View File

@ -27,6 +27,8 @@ Source0: http://ftp.de.debian.org/debian/pool/main/d/dpkg/dpkg_%{version}
Source3: sensible-editor Source3: sensible-editor
# PATCH-FIX-OPENSUSE replace debian with opensuse. replace macros. update-alternatives temp directories' path and name from dpkg* to rpm*. # 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 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 # PATCH-FIX-SUSE: update if two alternatives have same priority bnc#969171
Patch7: 0001-In-case-of-equal-priority-rather-update.patch Patch7: 0001-In-case-of-equal-priority-rather-update.patch
BuildRequires: autoconf BuildRequires: autoconf
@ -80,6 +82,9 @@ Libraries and header files for dpkg.
%prep %prep
%setup -q %setup -q
%patch1 -p1 %patch1 -p1
%if 0%{?suse_version} == 1315
%patch2 -p1
%endif
%patch7 -p1 %patch7 -p1
%build %build

14
drop-tar-option.patch Normal file
View File

@ -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);

2
update-alternatives.spec
View File

@ -22,7 +22,7 @@ Release: 0
Summary: Maintain symbolic links determining default commands Summary: Maintain symbolic links determining default commands
License: GPL-2.0+ License: GPL-2.0+
Group: System/Management 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 Source0: http://ftp.de.debian.org/debian/pool/main/d/dpkg/dpkg_%{version}.tar.xz
Source3: sensible-editor Source3: sensible-editor
Patch0: update-alternatives-suse.patch Patch0: update-alternatives-suse.patch