[dbus-java] Adapt for building/running with openjdk 7.

[Alexander Kurtakov]

commit 27f2739d7d0df22c73896b5a7c05e5cd2d1907f4
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Thu Aug 25 10:00:21 2011 +0300

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

 dbus-java.spec |   18 +++++++-----------
 1 files changed, 7 insertions(+), 11 deletions(-)
---
diff --git a/dbus-java.spec b/dbus-java.spec
index a89faaa..0ada674 100644
--- a/dbus-java.spec
+++ b/dbus-java.spec
@@ -1,6 +1,6 @@
 Name:       dbus-java
 Version:    2.7
-Release:    6%{?dist}
+Release:    7%{?dist}
 Summary:    Java implementation of the DBus protocol
 Group:      Development/Libraries
 License:    AFL or LGPLv2
@@ -15,9 +15,7 @@ Patch1:     classpath_fix.patch
 # fedora specific paths
 Patch2:     parallel.patch
 
-BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:  java-1.6.0-openjdk-devel
+BuildRequires:  java-devel >= 1:1.6.0
 BuildRequires:  jpackage-utils
 BuildRequires:  texlive-latex
 BuildRequires:  tetex-tex4ht
@@ -26,7 +24,7 @@ BuildRequires:  gettext
 BuildRequires:  libmatthew-java
 BuildRequires:  docbook2X
 
-Requires:   java-1.6.0-openjdk
+Requires:   java >= 1:1.6.0
 Requires:   jpackage-utils
 Requires:   libmatthew-java
 
@@ -96,7 +94,6 @@ make check \
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install \
     DESTDIR=$RPM_BUILD_ROOT \
     JARPREFIX=%{_javadir}/%{name} \
@@ -107,11 +104,7 @@ make install \
     JAVAUNIXLIBDIR=%{_libdir}/libmatthew-java \
     JAVAUNIXJARDIR=%{_libdir}/libmatthew-java
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
-%defattr(-,root,root,-)
 %{_javadir}/%{name}
 %{_bindir}/CreateInterface
 %{_bindir}/DBusCall
@@ -127,12 +120,15 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS COPYING INSTALL README
 
 %files javadoc
-%defattr(-,root,root,-)
 %{_javadocdir}/%{name}
 %doc COPYING
 
 
 %changelog
+* Thu Aug 25 2011 Alexander Kurtakov <akurtako at redhat.com> 2.7-7
+- Adapt for building/running with openjdk 7.
+- Remove not needed parts.
+
 * Sun Feb 13 2011 Mat Booth <fedora at matbooth.co.uk> 2.7-6
 - Inject OSGi manifests into jars so that they may be used in OSGi apps such
   as Eclipse plug-ins.