commit 0e1315053cb007c4b2dbdc97a4110ea1e02ddadd
Author: Roland Grunberg <rgrunber(a)redhat.com>
Date: Tue Apr 3 12:58:49 2012 -0400
Revert "Remove "BuildArch: noarch"."
This reverts commit 2f0ce7b38bd78228b7a50c7b3ece2f608f75fa8e.
tycho.spec | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/tycho.spec b/tycho.spec
index 0ccc58e..06ffd31 100644
--- a/tycho.spec
+++ b/tycho.spec
@@ -1,5 +1,4 @@
%global bootstrap 1
-%global eclipsedir %{_libdir}/eclipse
%if %{bootstrap}
%global snap -SNAPSHOT
@@ -36,6 +35,8 @@ Patch1: %{name}-maven-surefire.patch
Patch2: %{name}-bootstrap.patch
%endif
+BuildArch: noarch
+
BuildRequires: jpackage-utils
BuildRequires: java-devel
BuildRequires: maven
@@ -122,7 +123,7 @@ popd
%build
export MAVEN_OPTS="$MAVEN_OPTS -XX:MaxPermSize=256m"
-export TYCHO_TARGET_PLATFORM=%{eclipsedir}
+export TYCHO_TARGET_PLATFORM=%{_eclipse_base}
mvn-rpmbuild -Dmaven.local.debug=true -X -Dmaven.test.skip=true \
-Dmaven.local.depmap.file=%{SOURCE2} \
-Dtycho.targetPlatform=$TYCHO_TARGET_PLATFORM install javadoc:aggregate
@@ -192,7 +193,7 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
%changelog
* Tue Mar 27 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.14.1-1.1
- Add missing tycho-testing-harness to be packaged.
-- Remove "BuildArch: noarch".
+- Use %%{_eclipse_base} from eclipse-platform.
* Fri Mar 9 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.14.1-1
- Update to 0.14.1 upstream tag.
Show replies by date