[swt-chart] Change R:java to R:java-headless (Bug 1068558).
Roland Grunberg
rgrunber at fedoraproject.org
Wed Feb 26 21:53:33 UTC 2014
commit 39b4583e351f372ae1d569bbfba2aac9c378f304
Author: Roland Grunberg <rgrunber at redhat.com>
Date: Wed Feb 26 16:01:06 2014 -0500
Change R:java to R:java-headless (Bug 1068558).
swt-chart.spec | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
---
diff --git a/swt-chart.spec b/swt-chart.spec
index 81f6d82..36ef573 100644
--- a/swt-chart.spec
+++ b/swt-chart.spec
@@ -1,6 +1,6 @@
Name: swt-chart
Version: 0.8.0
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: SWTChart Feature
Group: Development/Tools
@@ -13,12 +13,11 @@ Source0: %{name}-%{version}.tar.xz
BuildArch: noarch
-BuildRequires: jpackage-utils
-BuildRequires: java-devel >= 1.5
+BuildRequires: maven-local
BuildRequires: tycho >= 0.14.0
+Requires: java-headless >= 1.5
Requires: jpackage-utils
-Requires: java >= 1.5
Requires: eclipse-platform >= 3.4.0
%description
@@ -36,10 +35,10 @@ Requires: jpackage-utils
%prep
%setup -q
# Create the poms
-mvn-rpmbuild org.eclipse.tycho:tycho-pomgenerator-plugin:generate-poms -DgroupId=org.swtchart
+xmvn -o org.eclipse.tycho:tycho-pomgenerator-plugin:generate-poms -DgroupId=org.swtchart
%build
-mvn-rpmbuild install javadoc:aggregate
+xmvn -o install org.apache.maven.plugins:maven-javadoc-plugin:aggregate
%install
install -d -m 755 %{buildroot}%{_javadir}
@@ -67,6 +66,9 @@ cp -rp target/site/apidocs %{buildroot}%{_javadocdir}/%{name}
%doc %{_javadocdir}/%{name}
%changelog
+* Wed Feb 26 2014 Roland Grunberg <rgrunber at redhat.com> - 0.8.0-9
+- Change R:java to R:java-headless (Bug 1068558).
+
* Wed Oct 23 2013 Roland Grunberg <rgrunber at redhat.com> 0.8.0-8
- Fix Bug 1022166.
More information about the scm-commits
mailing list