From 8f81408b94c4b68c34de722412ed3735350aa163dcb32a13ec1f57769a13d767 Mon Sep 17 00:00:00 2001
From: Martin Pluskal <mpluskal@suse.com>
Date: Sun, 29 Mar 2015 19:31:39 +0000
Subject: [PATCH] Accepting request 293638 from
 home:jengelh:branches:devel:tools

proposal [bnc#924827] /
http://lists.opensuse.org/opensuse-factory/2015-03/msg00391.html

OBS-URL: https://build.opensuse.org/request/show/293638
OBS-URL: https://build.opensuse.org/package/show/devel:tools/strace?expand=0&rev=46
---
 baselibs.conf  | 23 +++++++++++++++++++----
 strace.changes |  6 ++++++
 strace.spec    |  3 +++
 3 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/baselibs.conf b/baselibs.conf
index 0a969f9..2ebdeed 100644
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -1,4 +1,19 @@
-strace
-  +/usr/bin/strace-graph -> /usr/bin/strace-graph<extension>
-  +/usr/bin/strace -> /usr/bin/strace<extension>
-  prereq -glibc-x86
+# strace.{x86_64,sparc64,ppc64,...} can already trace both ELF32 and ELF64
+# processes, and there is no need for having an strace32.
+#
+# Using baselibs, we could create a strace-64bit.ppc/strace-64bit.sparc
+# convenience package (for systems with mostly-ELF32 userspace), but then
+# again, one can just as well install strace.ppc64 to get the same effect…
+#
+arch ppc64 package strace
+	+/usr/bin/strace-graph -> /usr/bin/strace-graph<extension>
+	+/usr/bin/strace -> /usr/bin/strace<extension>
+
+
+# IA64 oddball: it uses that special kind of emulation, so in this case,
+# the strace-x86 may still be needed!
+#
+arch ia64 package strace
+	+/usr/bin/strace-graph -> /usr/bin/strace-graph<extension>
+	+/usr/bin/strace -> /usr/bin/strace<extension>
+	prereq -glibc-x86
diff --git a/strace.changes b/strace.changes
index a95d4dc..230191f 100644
--- a/strace.changes
+++ b/strace.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sun Mar 29 17:02:23 UTC 2015 - jengelh@inai.de
+
+- Drop strace-32bit, since the normal strace build is powerful
+  enough. [bnc#924827]
+
 -------------------------------------------------------------------
 Tue Mar 24 09:02:49 UTC 2015 - schwab@suse.de
 
diff --git a/strace.spec b/strace.spec
index 6ac1ba3..93bec2c 100644
--- a/strace.spec
+++ b/strace.spec
@@ -57,6 +57,9 @@ BuildRequires:  xz
 %ifarch ppc64
 Obsoletes:      strace-64bit
 %endif
+%ifarch x86_64
+Obsoletes:      strace-32bit
+%endif
 
 %description
 With strace, you can trace the activity of a program.  Information