Attachment 633377 Details for Bug 870094 – git-formatted patch to add orbit dependency for relocated emf bundle

[patch] git-formatted patch to add orbit dependency for relocated emf bundle

0001-Add-orbit-dependency-to-relocated-org.eclipse.emf.ed.patch (text/plain), 1.73 KB, created by Gerard Ryan on 2012-10-25 14:34:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Gerard Ryan

Created: 2012-10-25 14:34:50 UTC

Size: 1.73 KB

patch

obsolete

>From e3790d00a51964c33781366a6481f2abd502f8b6 Mon Sep 17 00:00:00 2001
>From: Gerard Ryan <gerard@ryan.lt>
>Date: Thu, 25 Oct 2012 15:21:50 +0100
>Subject: [PATCH] Add orbit dependency to relocated org.eclipse.emf.edit_*.jar
>
>---
> eclipse-wtp-common.spec | 15 +++++++++++++--
> 1 file changed, 13 insertions(+), 2 deletions(-)
>
>diff --git a/eclipse-wtp-common.spec b/eclipse-wtp-common.spec
>index 395fe13..af4c965 100644
>--- a/eclipse-wtp-common.spec
>+++ b/eclipse-wtp-common.spec
>@@ -2,7 +2,7 @@
> 
> Name:			eclipse-wtp-common
> Version:		3.4.0
>-Release:		3.20120711cvs%{?dist}
>+Release:		4.20120711cvs%{?dist}
> Summary:		Common infrastructure and utilities developed and used with WTP
> 
> License:		EPL
>@@ -33,6 +33,14 @@ extensible URI resolver.
> %prep
> %setup -q -n eclipse-wtp-common-3.4.0
> 
>+#Orbit links
>+rm -rf orbit
>+mkdir orbit
>+pushd orbit
>+%{__ln_s} %{_javadir}/emf/eclipse/plugins/org.eclipse.emf.edit_*.jar
>+popd
>+
>+
> %build
> OPTIONS="-DforceContextQualifier=201109301723 -DjavacSource=1.5 -DjavacTarget=1.5"
> 
>@@ -45,7 +53,7 @@ eclipse-pdebuild -f org.eclipse.jst.common.fproj.enablement.jdt \
> 	-d "emf gef" -a "$OPTIONS"
> 
> eclipse-pdebuild -f org.eclipse.wst.common_core.feature \
>-	-d "emf gef" -a "$OPTIONS"
>+	-d "emf gef" -a "$OPTIONS" -o `pwd`/orbit
> 
> eclipse-pdebuild -f org.eclipse.wst.server_core.feature \
> 	-d "emf gef" -a "$OPTIONS"
>@@ -77,6 +85,9 @@ unzip -q -o -d %{buildroot}%{install_loc}/%{name} \
> 
> 
> %changelog
>+* Wed Oct 25 2012 Gerard Ryan<galileo@fedoraproject.org> - 3.4.0-4.20120711cvs
>+- Add orbit dependency to relocated org.eclipse.emf.edit_*.jar.
>+
> * Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.4.0-3.20120711cvs
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
> 
>-- 
>1.7.12.1
>

Actions: View | Diff

Attachments on bug 870094: 633377