From: Dmitry V. Levin <ldv@altlinux.org>
Date: Sun, 5 Aug 2018 11:49:04 +0000 (+0000)
Subject: strace.spec.in: remove strace64 subpackage
X-Git-Tag: v4.24~19
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=594cd12cd6aa7636fb389d04d024b2812f2c6241;p=strace

strace.spec.in: remove strace64 subpackage

strace64 subpackage used to be installed into ppc32 and sparc32
userspace running by a 64-bit kernel to trace 64-bit processes.

As simultaneous decoding of processes running both in 64-bit and 32-bit
personality is fully supported on every architecture with compat kernel
support for quite some time, one can just install a 64-bit strace and
there is no more need for that strace64 kludge.

* strace.spec.in (strace64_arches, copy64, %ifarch %{strace64_arches}):
Remove.
---

diff --git a/strace.spec.in b/strace.spec.in
index 0f319f43..ed0750e6 100644
--- a/strace.spec.in
+++ b/strace.spec.in
@@ -18,7 +18,6 @@ BuildRequires: pkgconfig(bluez)
 %endif
 # for -k option
 %{?buildrequires_stacktrace}
-%define strace64_arches ppc64 sparc64
 %{?!buildroot:BuildRoot: %_tmppath/buildroot-%name-%version-%release}
 
 %description
@@ -31,25 +30,6 @@ purposes.
 Install strace if you need a tool to track the system calls made and
 received by a process.
 
-%ifarch %{strace64_arches}
-%package -n strace64
-Summary: Tracks and displays system calls associated with a running process.
-Group: Development/Debuggers
-
-%description -n strace64
-The strace program intercepts and records the system calls called and
-received by a running process.  Strace can print a record of each
-system call, its arguments and its return value.  Strace is useful for
-diagnosing problems and debugging, as well as for instructional
-purposes.
-
-Install strace if you need a tool to track the system calls made and
-received by a process.
-
-This package provides the `strace64' program to trace 64-bit processes.
-The `strace' program in the `strace' package is for 32-bit processes.
-%endif
-
 %prep
 %setup -q
 echo -n %version-%release > .tarball-version
@@ -76,17 +56,6 @@ make DESTDIR=%{buildroot} install
 # remove unpackaged files from the buildroot
 rm -f %{buildroot}%{_bindir}/strace-graph
 
-%define copy64 ln
-%if 0%{?rhel}
-%if 0%{?rhel} < 6
-%endif
-%define copy64 cp -p
-%endif
-
-%ifarch %{strace64_arches}
-%{copy64} %{buildroot}%{_bindir}/strace %{buildroot}%{_bindir}/strace64
-%endif
-
 %check
 %{buildroot}%{_bindir}/strace -V
 make %{?_smp_mflags} -k check VERBOSE=1
@@ -103,12 +72,6 @@ echo 'END OF TEST SUITE INFORMATION'
 %{_bindir}/strace-log-merge
 %{_mandir}/man1/*
 
-%ifarch %{strace64_arches}
-%files -n strace64
-%{?suse_version:%defattr(-,root,root)}
-%{_bindir}/strace64
-%endif
-
 %changelog
 * @RPM_CHANGELOGTIME@ @PACKAGE_BUGREPORT@ - @PACKAGE_VERSION@-1
 - @PACKAGE_STRING@ snapshot.