From 55c6cd397b62bf84467f8d41fba5cf22dbbb08a3401135d4c11ce001263dbd40 Mon Sep 17 00:00:00 2001 From: Frank Lichtenheld Date: Mon, 25 Aug 2014 10:04:09 +0000 Subject: [PATCH 1/3] Accepting request 246120 from home:k0da:ppc - Update pkg-ppc64le.diff to fix Debian name for ppc64le OBS-URL: https://build.opensuse.org/request/show/246120 OBS-URL: https://build.opensuse.org/package/show/system:packagemanager/dpkg?expand=0&rev=14 --- dpkg-ppc64le.diff | 2 +- dpkg.changes | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dpkg-ppc64le.diff b/dpkg-ppc64le.diff index 4be1b66..ad56b1a 100644 --- a/dpkg-ppc64le.diff +++ b/dpkg-ppc64le.diff @@ -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 diff --git a/dpkg.changes b/dpkg.changes index 3c07c4e..e7b7439 100644 --- a/dpkg.changes +++ b/dpkg.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 From 4ac6329295c835e2e16011fa798a30e524f1fa30f83ad75c75392eaffed22ebd Mon Sep 17 00:00:00 2001 From: Frank Lichtenheld Date: Mon, 25 Aug 2014 13:50:18 +0000 Subject: [PATCH 2/3] Accepting request 246358 from home:jblunck:branches:system:packagemanager - Make Dpkg::Source::Archive use tar --format=gnu OBS-URL: https://build.opensuse.org/request/show/246358 OBS-URL: https://build.opensuse.org/package/show/system:packagemanager/dpkg?expand=0&rev=15 --- dpkg-archive_tar_format_gnu.patch | 24 ++++++++++++++++++++++++ dpkg.changes | 5 +++++ dpkg.spec | 4 ++++ 3 files changed, 33 insertions(+) create mode 100644 dpkg-archive_tar_format_gnu.patch diff --git a/dpkg-archive_tar_format_gnu.patch b/dpkg-archive_tar_format_gnu.patch new file mode 100644 index 0000000..bb7c472 --- /dev/null +++ b/dpkg-archive_tar_format_gnu.patch @@ -0,0 +1,24 @@ +From: Jan Blunck +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 + +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(); diff --git a/dpkg.changes b/dpkg.changes index e7b7439..1b4945c 100644 --- a/dpkg.changes +++ b/dpkg.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Aug 25 13:35:42 UTC 2014 - jblunck@infradead.org + +- Make Dpkg::Source::Archive use tar --format=gnu + ------------------------------------------------------------------- Sat Aug 23 19:02:35 UTC 2014 - dvlaeev@suse.com diff --git a/dpkg.spec b/dpkg.spec index 4bc871a..c548c60 100644 --- a/dpkg.spec +++ b/dpkg.spec @@ -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}" From 73fd5f3d7bdec6111f8a794e6813113c7900b85d6ba74d2c9ce6f5232c175e35 Mon Sep 17 00:00:00 2001 From: Frank Lichtenheld Date: Tue, 26 Aug 2014 13:17:01 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/system:packagemanager/dpkg?expand=0&rev=16 --- dpkg.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dpkg.changes b/dpkg.changes index 1b4945c..dea0f39 100644 --- a/dpkg.changes +++ b/dpkg.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Mon Aug 25 13:35:42 UTC 2014 - jblunck@infradead.org -- Make Dpkg::Source::Archive use tar --format=gnu +- 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