Accepting request 246518 from system:packagemanager
Fixed .changes OBS-URL: https://build.opensuse.org/request/show/246518 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dpkg?expand=0&rev=9
This commit is contained in:
commit
55eeaaeb21
24
dpkg-archive_tar_format_gnu.patch
Normal file
24
dpkg-archive_tar_format_gnu.patch
Normal file
@ -0,0 +1,24 @@
|
||||
From: Jan Blunck <jblunck@infradead.org>
|
||||
Subject: Make Dpkg::Source::Archive use tar --format=gnu
|
||||
|
||||
Some versions of tar (specifically on openSUSE 12.2) have different default
|
||||
tar format. So lets explicitly instruct Dpkg::Source::Archive to create the
|
||||
gnu tar format.
|
||||
|
||||
http://anonscm.debian.org/gitweb/?p=dpkg/dpkg.git;h=3f0c739bff65e6167cc91626fa77145247560fda
|
||||
|
||||
Signed-off-by: Jan Blunck <jblunck@infradead.org>
|
||||
|
||||
Index: dpkg-1.16.10/scripts/Dpkg/Source/Archive.pm
|
||||
===================================================================
|
||||
--- dpkg-1.16.10.orig/scripts/Dpkg/Source/Archive.pm
|
||||
+++ dpkg-1.16.10/scripts/Dpkg/Source/Archive.pm
|
||||
@@ -48,7 +48,7 @@ sub create {
|
||||
# Call tar creation process
|
||||
$spawn_opts{"delete_env"} = [ "TAR_OPTIONS" ];
|
||||
$spawn_opts{'exec'} = [ 'tar', '--null', '-T', '-', '--numeric-owner',
|
||||
- '--owner', '0', '--group', '0',
|
||||
+ '--owner', '0', '--group', '0', '--format=gnu',
|
||||
@{$opts{"options"}}, '-cf', '-' ];
|
||||
*$self->{"pid"} = spawn(%spawn_opts);
|
||||
*$self->{"cwd"} = getcwd();
|
@ -6,7 +6,7 @@ Index: dpkg-1.16.10/cputable
|
||||
mipsel mipsel mipsel 32 little
|
||||
powerpc powerpc (powerpc|ppc) 32 big
|
||||
ppc64 powerpc64 (powerpc|ppc)64 64 big
|
||||
+ppc64le powerpc64le (powerpc|ppc)64le 64 little
|
||||
+ppc64el powerpc64le (powerpc|ppc)64le 64 little
|
||||
s390 s390 s390 32 big
|
||||
s390x s390x s390x 64 big
|
||||
sh3 sh3 sh3 32 little
|
||||
|
10
dpkg.changes
10
dpkg.changes
@ -1,3 +1,13 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Aug 25 13:35:42 UTC 2014 - jblunck@infradead.org
|
||||
|
||||
- Add dpkg-archive_tar_format_gnu.patch: Make Dpkg::Source::Archive use tar --format=gnu
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Aug 23 19:02:35 UTC 2014 - dvlaeev@suse.com
|
||||
|
||||
- Update pkg-ppc64le.diff to fix Debian name for ppc64le
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon May 12 13:58:18 UTC 2014 - tchvatal@suse.com
|
||||
|
||||
|
@ -39,6 +39,7 @@ Patch4: dpkg-old-File-Path.patch
|
||||
Patch5: dpkg-old-Test-More.patch
|
||||
Patch6: dpkg-sparc.diff
|
||||
Patch7: dpkg-ppc64le.diff
|
||||
Patch8: dpkg-archive_tar_format_gnu.patch
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: libselinux-devel
|
||||
%define use_selinux 1
|
||||
@ -119,6 +120,9 @@ Provides translations to the package %{name}
|
||||
%endif
|
||||
%patch6 -p1
|
||||
%patch7 -p1
|
||||
%if 0%{?suse_version} >= 1220
|
||||
%patch8 -p1
|
||||
%endif
|
||||
|
||||
%build
|
||||
export CFLAGS="%{optflags}"
|
||||
|
Loading…
Reference in New Issue
Block a user