[tycho-extras] Change R:java to R:java-headless (Bug 1068575).

Roland Grunberg rgrunber at fedoraproject.org
Thu Feb 27 16:49:22 UTC 2014


commit dd531a1b69f079acec602e8cabb694d76515b675
Author: Roland Grunberg <rgrunber at redhat.com>
Date:   Thu Feb 27 10:51:26 2014 -0500

    Change R:java to R:java-headless (Bug 1068575).

 tycho-extras.spec |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/tycho-extras.spec b/tycho-extras.spec
index a27c2f8..7323849 100644
--- a/tycho-extras.spec
+++ b/tycho-extras.spec
@@ -4,7 +4,7 @@
 
 Name:           tycho-extras
 Version:        0.19.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Additional plugins for Tycho
 
 Group:          Development/Libraries
@@ -16,13 +16,12 @@ Patch1:         %{name}-use-custom-resolver.patch
 
 BuildArch:      noarch
 
-BuildRequires:  jpackage-utils
-BuildRequires:  java-devel >= 1.5
 BuildRequires:  jgit
+BuildRequires:  maven-local
 BuildRequires:  tycho
 
 Requires:       jpackage-utils
-Requires:       java >= 1.5
+Requires:       java-headless >= 1.5
 Requires:       jgit
 Requires:       tycho
 
@@ -54,7 +53,7 @@ This package contains the API documentation for %{name}.
 %build
 # To run tests, we need :
 # maven-properties-plugin (unclear licensing)
-mvn-rpmbuild -Dmaven.test.skip=true install javadoc:aggregate
+xmvn -o -Dmaven.test.skip=true install org.apache.maven.plugins:maven-javadoc-plugin:aggregate
 
 %install
 install -d -m 755 %{buildroot}%{_javadir}/%{name}
@@ -95,6 +94,9 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
 %{_javadocdir}/%{name}
 
 %changelog
+* Thu Feb 27 2014 Roland Grunberg <rgrunber at redhat.com> - 0.19.0-2
+- Change R:java to R:java-headless (Bug 1068575).
+
 * Fri Oct 25 2013 Roland Grunberg <rgrunber at redhat.com> - 0.19.0-1
 - Update to 0.19.0 Release.
 


More information about the scm-commits mailing list