Accepting request 390307 from home:pluskalm:branches:devel:tools

- Cleanup spec file with spec-cleaner
- Drop alpha/sparc conditionals, neither is supported
- Drop ppc/ppc64 provides/obsolete as no longer needed
- Do not export OPTFLAGS as they are used anyways

OBS-URL: https://build.opensuse.org/request/show/390307
OBS-URL: https://build.opensuse.org/package/show/devel:tools/strace?expand=0&rev=58

strace.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Sat Apr 16 12:44:28 UTC 2016 - mpluskal@suse.com
+
+- Cleanup spec file with spec-cleaner
+- Drop alpha/sparc conditionals, neither is supported
+- Drop ppc/ppc64 provides/obsolete as no longer needed
+- Do not export OPTFLAGS as they are used anyways
+
 -------------------------------------------------------------------
 Sat Dec 26 15:46:23 UTC 2015 - schwab@linux-m68k.org
 

strace.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package strace
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -23,31 +23,26 @@ Summary:        A utility to trace the system calls of a program
 License:        BSD-3-Clause
 Group:          Development/Tools/Debuggers
 Url:            http://sourceforge.net/projects/strace/
-
 #Freecode-URL:	http://freecode.com/projects/strace
 #Git-Clone:	git://git.code.sf.net/p/strace/code
-Source:         http://downloads.sourceforge.net/strace/%name-%version.tar.xz
-Source2:        http://downloads.sourceforge.net/strace/%name-%version.tar.xz.asc
-Source3:        %name.keyring
+Source:         http://downloads.sourceforge.net/strace/%{name}-%{version}.tar.xz
+Source2:        http://downloads.sourceforge.net/strace/%{name}-%{version}.tar.xz.asc
+Source3:        %{name}.keyring
 Source4:        baselibs.conf
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  haveged
 BuildRequires:  libacl-devel
 BuildRequires:  libaio-devel
+BuildRequires:  lksctp-tools-devel
+BuildRequires:  xz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 # libunwind is broken on ppc and ppc64 and aarch64
-%ifarch %ix86 ia64 x86_64 %{arm} ppc64le
+%ifarch %ix86 ia64 x86_64 %arm ppc64le
 BuildRequires:  libunwind-devel
 %endif
-BuildRequires:  lksctp-tools-devel
-%if 0%{suse_version} > 1140
+%if 0%{?suse_version} > 1140
 BuildRequires:  sysvinit-tools
 BuildRequires:  time
 %endif
-BuildRequires:  xz
-# bug437293
-%ifarch ppc64
-Obsoletes:      strace-64bit
-%endif
 %ifarch x86_64
 Obsoletes:      strace-32bit
 %endif
@@ -57,51 +52,35 @@ With strace, you can trace the activity of a program.  Information
 about any system calls the program makes and the signals it receives
 and processes can be seen.  Child processes can also be tracked.
 
-
-
-Authors:
---------
-    Paul Kranenburg  <pk@cs.few.eur.nl>
-    Branko Lankester <branko@hacktic.nl>
-    Rick Sladkey <rs@world.std.com>
-
 %prep
 %setup -q
 
 %build
-export CFLAGS="$RPM_OPT_FLAGS"
-%ifarch alpha
-CFLAGS="$CFLAGS -ffixed-8"
-%endif
-%configure \
-%ifarch %sparc
-	--host=%_target_platform \
-%endif
-	%{nil}
+%configure
 make %{?_smp_mflags}
 
 # Have to exclude make check for qemu builds, which apparently don't support PTRACE.
 %if !(0%{?qemu_user_space_build})
 %check
-haveged=$(PATH=$PATH:/sbin:/usr/sbin type -p haveged)
+haveged=$(PATH=$PATH:/sbin:%{_sbindir} type -p haveged)
 if test -n "$haveged" && ! /sbin/checkproc $haveged ; then
     $haveged --pidfile=$PWD/haveged.pid < /dev/null 1>&0 2>&0 || true
 fi
-make check || { cat tests/test-suite.log; exit 1; }
+make %{?_smp_mflags} check || { cat tests/test-suite.log; exit 1; }
 if test -s $PWD/haveged.pid ; then
     /sbin/killproc -p $PWD/haveged.pid $haveged
 fi
 %endif
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT
+make %{?_smp_mflags} DESTDIR=%{buildroot} install
 
 %files
 %defattr(-,root,root)
 %doc CREDITS README README-linux-ptrace NEWS
-%{_prefix}/bin/strace
-%{_prefix}/bin/strace-graph
-%{_prefix}/bin/strace-log-merge
-%{_mandir}/man1/strace.1.gz
+%{_bindir}/strace
+%{_bindir}/strace-graph
+%{_bindir}/strace-log-merge
+%{_mandir}/man1/strace.1%{ext_man}
 
 %changelog