[eclipse-oprofile/f15/master] - Clean up the mess I've just created :( - Re-add binutils-static BR - Add oprofile-static BR - Fixe

[jerboaa]

commit 4a2f4bcbe82b2dc53a21dc9a395f5bad2aac1b8c
Author: Severin Gehwolf <sgehwolf at redhat.com>
Date:   Thu Apr 7 17:05:18 2011 -0400

    - Clean up the mess I've just created :(
    - Re-add binutils-static BR
    - Add oprofile-static BR
    - Fixes RHBZ#616493

 eclipse-oprofile.spec |   17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 deletions(-)
---
diff --git a/eclipse-oprofile.spec b/eclipse-oprofile.spec
index d3b5390..47a0fb3 100644
--- a/eclipse-oprofile.spec
+++ b/eclipse-oprofile.spec
@@ -14,7 +14,7 @@
 
 Name:           eclipse-oprofile
 Version:        0.6.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Eclipse plugin for OProfile integration
 
 Group:          Development/Tools
@@ -31,8 +31,15 @@ BuildRequires: eclipse-pde >= 1:3.5.0
 BuildRequires: eclipse-cdt >= 6.0.0
 BuildRequires: eclipse-linuxprofilingframework >= 0.1.0
 BuildRequires: oprofile >= 0.9.3
-BuildRequires: oprofile-devel >= 0.9.3
+# TODO: remove once we don't require opxml anymore. FYI: oprofile 0.7.x has it
+# removed.
+# Since 0.9.6-19 oprofile-devel provides oprofile-static.
+BuildRequires: oprofile-devel >= 0.9.6-19
 BuildRequires: binutils-devel >= 2.18.50.0.6
+# binutils-static is provided by binutils-devel
+BuildRequires: binutils-static >= 2.18.50.0.6
+# oprofile-static is provided by oprofile-devel since 0.9.6-19
+BuildRequires: oprofile-static >= 0.9.6-19
 Requires: eclipse-platform >= 3.5.0
 Requires: eclipse-cdt >= 6.0.0
 Requires: eclipse-linuxprofilingframework >= 0.2.0
@@ -109,6 +116,12 @@ chmod +x \
 %{_sysconfdir}/pam.d/opcontrol
 
 %changelog
+* Thu Apr 7 2011 Severin Gehwolf <sgehwolf at redhat.com> 0.6.1-4
+- Clean up the mess I've just created :(
+- Re-add binutils-static BR
+- Add oprofile-static BR
+- Fixes RHBZ#616493
+
 * Thu Apr 7 2011 Severin Gehwolf <sgehwolf at redhat.com> 0.6.1-3
 - Remove oprofile-static BR, since it's not required anymore