[eclipse-mylyn] Change R:java to R:java-headless (Bug 1068050).

Roland Grunberg rgrunber at fedoraproject.org
Fri Feb 28 18:06:53 UTC 2014


commit 749faf24f852489ff37ddba2155ab2f8cdd0ce60
Author: Roland Grunberg <rgrunber at redhat.com>
Date:   Fri Feb 28 12:59:56 2014 -0500

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

 eclipse-mylyn.spec |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/eclipse-mylyn.spec b/eclipse-mylyn.spec
index 17a9cfd..1921e42 100644
--- a/eclipse-mylyn.spec
+++ b/eclipse-mylyn.spec
@@ -11,7 +11,7 @@
 Name:    %{?scl_prefix}eclipse-mylyn
 Summary: Eclipse Mylyn main feature.
 Version: 3.10.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: EPL
 URL: http://www.eclipse.org/mylyn
 
@@ -38,8 +38,6 @@ Patch7: %{pkg_name}-build-compat.patch
 
 BuildArch: noarch
 
-BuildRequires: java-devel >= 1.7.0
-BuildRequires: jpackage-utils >= 1.7.5-18.1
 BuildRequires: eclipse-platform >= 1:4.2.0
 BuildRequires: eclipse-pde >= 1:4.2.0-0.6
 BuildRequires: eclipse-rcp >= 1:4.2.0-0.6
@@ -289,7 +287,7 @@ build providers using Eclipse Mylyn.
 
 %package builds-hudson
 Summary: Mylyn Builds Connector: Hudson/Jenkins
-Requires: java >= 1:1.7.0
+Requires: java-headless >= 1:1.7.0
 Requires: %{?scl_prefix}eclipse-platform >= 1:4.2.0-0.6
 Requires: %{name} = %{version}-%{release}
 Requires: google-gson >= 1.6.0
@@ -387,7 +385,7 @@ sed -i -e "s/e3.5/e3.6/g" org.eclipse.mylyn.commons/org.eclipse.mylyn.commons-ta
 %build
 %{?scl:%scl_maven_opts}
 export MAVEN_OPTS="-XX:CompileCommand=exclude,org/eclipse/tycho/core/osgitools/EquinoxResolver,newState ${MAVEN_OPTS}"
-mvn-rpmbuild clean install -Dmaven.test.skip=true
+xmvn -o clean install -Dmaven.test.skip=true
 
 %install
 install -d %{buildroot}%{install_loc}/mylyn
@@ -705,6 +703,9 @@ install %{SOURCE6} %{buildroot}%{install_loc}/mylyn/eclipse/redhat-bugzilla-cust
 %doc org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.sdk-feature/license.html
 
 %changelog
+* Fri Feb 28 2014 Roland Grunberg <rgrunber at redhat.com> - 3.10.0-3
+- Change R:java to R:java-headless (Bug 1068050).
+
 * Fri Feb 28 2014 Mikolaj Izdebski <mizdebsk at redhat.com> - 3.10.0-2
 - Fix usage of %%pom_disable_module macro
 


More information about the scm-commits mailing list