[jacknativeclient] Require java-headless instead of java. Link with the Java javadocs.

Jerry James jjames at fedoraproject.org
Wed Feb 26 21:26:53 UTC 2014


commit 14c34c287122a8b636f035df87f17ba032eea9b4
Author: Jerry James <loganjerry at gmail.com>
Date:   Wed Feb 26 14:27:20 2014 -0700

    Require java-headless instead of java.
    Link with the Java javadocs.

 jacknativeclient.spec |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/jacknativeclient.spec b/jacknativeclient.spec
index 6e02479..5349a40 100644
--- a/jacknativeclient.spec
+++ b/jacknativeclient.spec
@@ -5,7 +5,7 @@
 
 Name:           jacknativeclient
 Version:        0
-Release:        0.5.%{gitdate}git%{?dist}
+Release:        0.6.%{gitdate}git%{?dist}
 Summary:        Java bindings for JACK clients
 
 License:        LGPLv3+
@@ -15,9 +15,10 @@ Source0:        https://github.com/%{user}/%{name}/tarball/%{gittag}/%{user}-%{n
 BuildRequires:  ant
 BuildRequires:  jack-audio-connection-kit-devel
 BuildRequires:  java-devel >= 1:1.6.0
+BuildRequires:  java-javadoc >= 1:1.6.0
 BuildRequires:  jpackage-utils
 
-Requires:       java >= 1:1.6.0
+Requires:       java-headless
 Requires:       jpackage-utils
 
 %description
@@ -51,7 +52,8 @@ jar cf ../%{name}.jar com
 cd ..
 
 # Build the javadoc documentation
-javadoc -d api -sourcepath src -classpath bin com.noisepages.nettoyeur.jack
+javadoc -d api -link file://%{_javadocdir}/java \
+  -sourcepath src -classpath bin com.noisepages.nettoyeur.jack
 
 # build.xml tries to build both 32-bit and 64-bit shared libraries, and
 # also doesn't use our CFLAGS.  Fix both problems with a manual build.
@@ -80,6 +82,10 @@ cp -a api %{buildroot}%{_javadocdir}/%{name}
 %{_javadocdir}/%{name}/
 
 %changelog
+* Wed Feb 26 2014 Jerry James <loganjerry at gmail.com> - 0-0.6.20120218git
+- Require java-headless instead of java
+- Link with the Java javadocs
+
 * Wed Feb 19 2014 Jerry James <loganjerry at gmail.com> - 0-0.5.20120218git
 - Add a link to the jar in jnidir
 - Link with RPM_LD_FLAGS


More information about the scm-commits mailing list