[swt-chart] Revert "Remove "BuildArch: noarch"."

Roland Grunberg rgrunber at fedoraproject.org
Wed Apr 4 17:06:23 UTC 2012


commit 2c2fe142012e598d88dd7350581653e5b5d172d3
Author: Roland Grunberg <rgrunber at redhat.com>
Date:   Tue Apr 3 09:54:19 2012 -0400

    Revert "Remove "BuildArch: noarch"."
    
    This reverts commit 890098fe1f3ee7669fe013b62abca3e20e554525.

 swt-chart.spec |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)
---
diff --git a/swt-chart.spec b/swt-chart.spec
index 56bfe0e..f2db917 100644
--- a/swt-chart.spec
+++ b/swt-chart.spec
@@ -1,8 +1,6 @@
-%global eclipse_base   %{_libdir}/eclipse
-
 Name:           swt-chart
 Version:        0.8.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        SWTChart Feature
 
 Group:          Development/Tools
@@ -13,6 +11,8 @@ URL:            http://www.swtchart.org/
 # tar -cJf %%{name}-%%{version}.tar.xz %%{name}-%%{version}
 Source0:        %{name}-%{version}.tar.xz
 
+BuildArch:      noarch
+
 BuildRequires:  jpackage-utils
 BuildRequires:  java-devel >= 1.5
 BuildRequires:  tycho >= 0.14.0
@@ -36,10 +36,10 @@ Requires:       jpackage-utils
 %prep
 %setup -q
 # Create the poms
-mvn-rpmbuild org.eclipse.tycho:tycho-pomgenerator-plugin:generate-poms -DgroupId=org.swtchart -Dtycho.targetPlatform=%{eclipse_base}
+mvn-rpmbuild org.eclipse.tycho:tycho-pomgenerator-plugin:generate-poms -DgroupId=org.swtchart -Dtycho.targetPlatform=%{_eclipse_base}
 
 %build
-mvn-rpmbuild -Dtycho.targetPlatform=%{eclipse_base} install javadoc:aggregate
+mvn-rpmbuild -Dtycho.targetPlatform=%{_eclipse_base} install javadoc:aggregate
 
 %install
 install -d -m 755 %{buildroot}%{_javadir}
@@ -68,9 +68,11 @@ cp -rp target/site/apidocs %{buildroot}%{_javadocdir}/%{name}
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Wed Apr 4 2012 Roland Grunberg <rgrunber at redhat.com> 0.8.0-3
+- Use %%{_eclipse_base} from eclipse-platform.
+
 * Mon Apr 2 2012 Roland Grunberg <rgrunber at redhat.com> 0.8.0-2
 - Explicitly require java/java-devel >= 1.5 as per manifest.
 
 * Sat Mar 6 2012 Roland Grunberg <rgrunber at redhat.com> 0.8.0-1
 - Initial packaging of SWTChart.
-


More information about the scm-commits mailing list