[findbugs-contrib] Adapt for building/running with openjdk 7.

[Alexander Kurtakov]

commit 960cd3f88d1c04a234c18c56436842af0f5fe271
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Thu Aug 25 09:44:22 2011 +0300

    Adapt for building/running with openjdk 7.
    
    - Remove not needed parts.

 findbugs-contrib.spec |   20 +++++++-------------
 1 files changed, 7 insertions(+), 13 deletions(-)
---
diff --git a/findbugs-contrib.spec b/findbugs-contrib.spec
index 3bd8f3f..fa518f1 100644
--- a/findbugs-contrib.spec
+++ b/findbugs-contrib.spec
@@ -6,7 +6,7 @@
 
 Name:           findbugs-contrib
 Version:        4.2.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Extra findbugs detectors
 
 Group:          Development/Languages
@@ -17,12 +17,11 @@ Source0:        http://downloads.sourceforge.net/fb-contrib/fb-contrib-src-%{ver
 # changes.  It looks in /usr/share/java for jar files at both compile time and
 # run time, instead of using the jars in lib/.
 Patch0:         findbugs-contrib-build.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-BuildRequires:  ant-nodeps, findbugs, java-1.6.0-openjdk-devel, jpackage-utils
+BuildRequires:  ant, findbugs, java-devel >= 1:1.6.0, jpackage-utils
 BuildRequires:  jsp21, junit4, log4j, servlet25
-Requires:       findbugs, java-1.6.0-openjdk, jpackage-utils
+Requires:       findbugs, java >= 1:1.6.0, jpackage-utils
 
 %description
 This is an extra detector plugin to be used with the static bug finder
@@ -70,8 +69,6 @@ ant build
 ant javadoc
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 # Install the plugin
 mkdir -p $RPM_BUILD_ROOT%{plugin_dir}
 cp -p fb-contrib-%{version}.jar $RPM_BUILD_ROOT%{plugin_dir}
@@ -86,27 +83,24 @@ mkdir -p $RPM_BUILD_ROOT%{eclipse_plugin_dir}
 ln -s %{plugin_dir}/fb-contrib-%{version}.jar \
   $RPM_BUILD_ROOT%{eclipse_plugin_dir}/fb-contrib-%{version}.jar
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
-%defattr(-,root,root,-)
 %doc license.txt htdocs/*
 %{plugin_dir}/fb-contrib-%{version}.jar
 
 %files javadoc
-%defattr(-,root,root,-)
 %{_javadocdir}/*
 
 %files samples
-%defattr(-,root,root,-)
 %doc samples/*
 
 %files -n eclipse-findbugs-contrib
-%defattr(-,root,root,-)
 %{eclipse_plugin_dir}/fb-contrib-%{version}.jar
 
 %changelog
+* Thu Aug 25 2011 Alexander Kurtakov <akurtako at redhat.com> 4.2.0-4
+- Adapt for building/running with openjdk 7.
+- Remove not needed parts.
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild