rpms/stapitrace/F-13 stapitrace.spec,1.27,1.28

[Maynard Johnson]

Author: maynardj

Update of /cvs/pkgs/rpms/stapitrace/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv30726

Modified Files:
	stapitrace.spec 
Log Message:

Add 'BuildRequires binutils-static.  Also add requirement for SystemTap 1.0
or greater.



Index: stapitrace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/stapitrace/F-13/stapitrace.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- stapitrace.spec	27 Jul 2009 04:48:54 -0000	1.27
+++ stapitrace.spec	1 Jul 2010 14:40:23 -0000	1.28
@@ -6,7 +6,7 @@
 Name:		stapitrace
 Summary:	Instruction Tracing Tool
 Version:	2.0.0
-Release:	0.%{alphatag}%{?dist}.1
+Release:	0.%{alphatag}%{?dist}.3
 License:	GPLv2+
 Group:		Development/Tools
 URL:		http://sourceforge.net/projects/perfinsp
@@ -17,8 +17,8 @@ Patch2:         stapitrace-insn-update.p
 Patch3:         itrace-bfd-config.patch
 Patch4:         stapitrace-build-fixes.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
-Requires:	systemtap systemtap-runtime binutils binutils-devel
-BuildRequires:	binutils binutils-devel autoconf automake zlib-devel
+Requires:	systemtap > 1.0 systemtap-runtime, binutils, binutils-devel
+BuildRequires:	binutils binutils-devel binutils-static autoconf automake zlib-devel
 ExclusiveArch:	ppc ppc64
 
 %description
@@ -32,7 +32,7 @@ It is based on and shares code from Perf
 
 %define systap %{_datadir}/systemtap
 %define tap %{systap}/tapset
-%define tap64 %{tap}/ppc64
+%define tap_powerpc %{tap}/powerpc
 %define post src/post
 %define a2n src/a2n
 %define stap src/stap
@@ -66,14 +66,14 @@ export CXXFLAGS="%{__global_cflags} -mmi
 %{__mkdir_p} $RPM_BUILD_ROOT/%{systap}
 %{__mkdir_p} $RPM_BUILD_ROOT/%{systap}/runtime
 %{__mkdir_p} $RPM_BUILD_ROOT/%{tap}
-%{__mkdir_p} $RPM_BUILD_ROOT/%{tap64}
+%{__mkdir_p} $RPM_BUILD_ROOT/%{tap_powerpc}
 %{__install} -m 755 %{post}/post $RPM_BUILD_ROOT/%{_bindir}/post
 cd src/stap 
 %{__install} -m 644 itrace.1 $RPM_BUILD_ROOT/%{_mandir}/man1/itrace.1
 %{__install} -m 644 post.1 $RPM_BUILD_ROOT/%{_mandir}/man1/post.1
 %{__install} -m 755 itrace $RPM_BUILD_ROOT/%{_bindir}/itrace
 %{__install} -m 644 pi_itrace.stp $RPM_BUILD_ROOT/%{tap}/pi_itrace.stp
-%{__install} -m 644 ppc_pi_itrace.stp $RPM_BUILD_ROOT/%{tap64}/ppc_pi_itrace.stp
+%{__install} -m 644 ppc_pi_itrace.stp $RPM_BUILD_ROOT/%{tap_powerpc}/ppc_pi_itrace.stp
 
 
 %clean
@@ -82,13 +82,22 @@ cd src/stap 
 %files 
 %defattr(-,root,root)
 %{tap}/pi_itrace.stp
-%{tap64}/ppc_pi_itrace.stp
+%{tap_powerpc}/ppc_pi_itrace.stp
 %{_mandir}/man1/itrace.1.gz
 %{_mandir}/man1/post.1.gz
 %{_bindir}/post
 %{_bindir}/itrace
 
 %changelog
+* Thu Jul 1 2010 Maynard Johnson <maynardj at us.ibm.com>
+- Added 'BuildRequires: binutils-static' to address Red Hat bug
+  https://bugzilla.redhat.com/show_bug.cgi?id=609863. 
+  While fixing the problem described in the above-mentioned bug,
+  I noted that I neeed to add the same requirement for systemtap
+  version 1.0 that I had previously added in the devel branch.  This
+  change necessitated moving some tapset files from subdir 'ppc64'
+  to 'powerpc' to match change in systemtap 1.0.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.0-0.20090304cvs_alpha.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild