From 6f52397131ac24ad56cc005ad25d362cd73c3cb3801c1ae99096cf73d5b8207e Mon Sep 17 00:00:00 2001 From: Philipp Thomas Date: Tue, 9 Jul 2013 13:16:22 +0000 Subject: [PATCH] Accepting request 182586 from home:jengelh:branches:system:packagemanager pedantic change from %patch -P 6 to %patch6 OBS-URL: https://build.opensuse.org/request/show/182586 OBS-URL: https://build.opensuse.org/package/show/system:packagemanager/dpkg?expand=0&rev=8 --- dpkg-sparc.diff | 25 +++++++++++++++++++++++++ dpkg.changes | 5 +++++ dpkg.spec | 2 ++ update-alternatives.changes | 5 +++++ update-alternatives.spec | 2 ++ 5 files changed, 39 insertions(+) create mode 100644 dpkg-sparc.diff diff --git a/dpkg-sparc.diff b/dpkg-sparc.diff new file mode 100644 index 0000000..8900416 --- /dev/null +++ b/dpkg-sparc.diff @@ -0,0 +1,25 @@ +From: Jan Engelhardt +Date: 2013-07-03 11:48:39.034294424 +0200 +X-Upstream: General patch applicable for all distributions. + +cputable: support invocation via `./configure --host=sparcv9-linux-gnu` + +autoconf knows to handle sparc*, but the dpkg specific +m4/dpkg-arch.m4 does not. + +--- + cputable | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +Index: dpkg-1.16.10/cputable +=================================================================== +--- dpkg-1.16.10.orig/cputable ++++ dpkg-1.16.10/cputable +@@ -37,5 +37,5 @@ sh3 sh3 sh3 32 little + sh3eb sh3eb sh3eb 32 big + sh4 sh4 sh4 32 little + sh4eb sh4eb sh4eb 32 big +-sparc sparc sparc 32 big +-sparc64 sparc64 sparc64 64 big ++sparc64 sparc64 sparc64.* 64 big ++sparc sparc sparc.* 32 big diff --git a/dpkg.changes b/dpkg.changes index 31f693e..072696f 100644 --- a/dpkg.changes +++ b/dpkg.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jul 3 09:57:49 UTC 2013 - jengelh@inai.de + +- Add dpkg-sparc.diff to unbreak compilation on sparcv9 build + ------------------------------------------------------------------- Tue Mar 26 13:22:40 UTC 2013 - frank.lichtenheld@sophos.com diff --git a/dpkg.spec b/dpkg.spec index f2d542c..3242e52 100644 --- a/dpkg.spec +++ b/dpkg.spec @@ -37,6 +37,7 @@ Patch3: dpkg-pod2man-no-utf8.patch Patch4: dpkg-old-File-Path.patch # PATCH-FIX-SUSE support for old Test::More (SLES11) Patch5: dpkg-old-Test-More.patch +Patch6: dpkg-sparc.diff BuildRequires: gcc-c++ BuildRequires: libselinux-devel %define use_selinux 1 @@ -115,6 +116,7 @@ Provides translations to the package %{name} %patch4 -p1 %patch5 -p1 %endif +%patch6 -p1 %build export CFLAGS="%{optflags}" diff --git a/update-alternatives.changes b/update-alternatives.changes index 72e3b7a..26d50dc 100644 --- a/update-alternatives.changes +++ b/update-alternatives.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jul 3 09:57:49 UTC 2013 - jengelh@inai.de + +- Add dpkg-sparc.diff to unbreak compilation on sparcv9 build + ------------------------------------------------------------------- Mon Mar 25 20:35:24 UTC 2013 - frank.lichtenheld@sophos.com diff --git a/update-alternatives.spec b/update-alternatives.spec index 3d87f43..957ca08 100644 --- a/update-alternatives.spec +++ b/update-alternatives.spec @@ -29,6 +29,7 @@ Source0: http://ftp.de.debian.org/debian/pool/main/d/dpkg/dpkg_%{version} Source3: sensible-editor Patch0: update-alternatives-1.16.8-suse.patch Patch1: dpkg-archtable-suse.patch +Patch6: dpkg-sparc.diff BuildRequires: ncurses-devel BuildRequires: xz BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -49,6 +50,7 @@ particular preference. %patch0 -p1 %patch1 -p1 +%patch6 -p1 %build %{configure} \