[eclipse-jbosstools] Build as a noarch package
Gerard Ryan
galileo at fedoraproject.org
Mon Oct 8 20:49:32 UTC 2012
commit 1ae21d0d69fa30defbf53ecb0b78019bf9df32cf
Author: Gerard Ryan <gerard at ryan.lt>
Date: Mon Oct 8 21:48:53 2012 +0100
Build as a noarch package
eclipse-jbosstools.spec | 21 ++++++++-------------
1 files changed, 8 insertions(+), 13 deletions(-)
---
diff --git a/eclipse-jbosstools.spec b/eclipse-jbosstools.spec
index 71b8b40..4a6e19c 100644
--- a/eclipse-jbosstools.spec
+++ b/eclipse-jbosstools.spec
@@ -1,5 +1,6 @@
%global eclipse_dropins %{_datadir}/eclipse/dropins
%global build_base build/.m2/org/jboss/tools/
+%global rls_tag Final
# Comma separated list of all modules that we're currently building (in order)
%global tools parent,common,usage,archives,jmx,as,jst,cdi,ws,freemarker
@@ -24,16 +25,11 @@ URL: http://www.jboss.org/tools.html
# requirements runtime runtime-soa seam struts xulrunner
# popd
# tar -cJf eclipse-jbosstools-3.3.1.Final-CLEAN.tar.xz eclipse-jbosstools-3.3.1.Final-CLEAN/
-Source0: %{name}-%{version}.Final-CLEAN.tar.xz
+Source0: %{name}-%{version}.%{rls_tag}-CLEAN.tar.xz
Source1: LICENSE-2.0.txt
Source2: lgpl-2.1.txt
-# Without one of the following patches, the following error prevents building:
-# [ERROR] Internal error: java.lang.RuntimeException: Could not determine SWT implementation fragment bundle
-Patch2: %{name}-x86_64.patch
-Patch3: %{name}-x86.patch
-
# feature.xml patch to remove 'requires' section - fails because of the way we
# have wtp packages set up currently - not all have same qualifier.
Patch10: %{name}-ws-rm-requires.patch
@@ -63,6 +59,8 @@ Patch21: %{name}-as.dmr.patch
Patch22: %{name}-as.core.patch
Patch23: %{name}-as.mgmt.as71.patch
+BuildArch: noarch
+
BuildRequires: ant >= 1.8.3
BuildRequires: ant-contrib >= 0.16.b3
BuildRequires: apache-commons-codec >= 1.6
@@ -359,7 +357,7 @@ FreeMarkerIDE provides editor for FreeMarker templates
%prep
-%setup -q -n %{name}-%{version}.Final-CLEAN
+%setup -q -n %{name}-%{version}.%{rls_tag}-CLEAN
cp %{SOURCE1} %{SOURCE2} .
@@ -458,12 +456,6 @@ popd
%pom_remove_dep ant:ant-optional build/parent
-%ifarch x86_64
-%patch2
-%else
-%patch3
-%endif
-
%patch10
%patch12
%patch13
@@ -606,6 +598,9 @@ popd;
%changelog
+* Mon Oct 08 2012 Gerard Ryan <galileo at fedoraproject.org> - 3.3.1-5
+- Build as a noarch package.
+
* Tue Sep 04 2012 Gerard Ryan <galileo at fedoraproject.org> - 3.3.1-4
- Add Fedora version to OSGi version qualifier.
More information about the scm-commits
mailing list