Attachment 911007 Details for Bug 1111787 – patch to add feature

[patch] patch to add feature

0001-Add-feature-org.eclipse.datatools.doc.user.patch (text/plain), 3.03 KB, created by Gerard Ryan on 2014-06-21 13:04:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Gerard Ryan

Created: 2014-06-21 13:04:57 UTC

Size: 3.03 KB

patch

obsolete

>From 17e1fcee0a1fb3420947177c10fff141b1a08b92 Mon Sep 17 00:00:00 2001
>From: Gerard Ryan <gerard@ryan.lt>
>Date: Sat, 21 Jun 2014 13:54:42 +0100
>Subject: [PATCH] Add feature org.eclipse.datatools.doc.user
>
>This seems to be needed to build against dtp-sqldevtools using tycho.
>
>There's a jar from the sources that's being unpacked here now so that it
>can be repacked. I don't know why, but it's stored as a jar in upstream
>source repository.
>---
> eclipse-dtp.spec | 17 ++++++++++++++++-
> 1 file changed, 16 insertions(+), 1 deletion(-)
>
>diff --git a/eclipse-dtp.spec b/eclipse-dtp.spec
>index 0e17b80..0fb29d5 100644
>--- a/eclipse-dtp.spec
>+++ b/eclipse-dtp.spec
>@@ -6,7 +6,7 @@
> 
> Name:      eclipse-dtp
> Version:   1.11.2
>-Release:   4%{?dist}
>+Release:   5%{?dist}
> Summary:   Eclipse Data Tools Platform
> Group:     System Environment/Libraries
> License:   EPL
>@@ -115,10 +115,18 @@ sed -i -e "s|2.9.0.qualifier|0.0.0|g" \
>   org.eclipse.datatools.enablement.oda.feature/feature.xml
> popd
> 
>+
>+# This jar needs to be unzipped so that it can be rebuilt
>+# It doesn't contain any binary stuff, just stored as a jar in source repo :-/
>+unzip -q -o -d org.eclipse.datatools.doc.user \
>+  org.eclipse.datatools.doc-%{tag}/packaged_jars/org.eclipse.datatools.doc.user_1.7.0.20090521092446.jar
>+
>+
> pushd org.eclipse.datatools.doc-%{tag}/packaged_jars
> rm -rf *.jar
> popd
> 
>+
> # make sure upstream hasn't snuck in any jars we don't know about
> JARS=""
> for j in `find -name "*.jar"`; do
>@@ -157,6 +165,8 @@ eclipse-pdebuild -f org.eclipse.datatools.sqldevtools.feature \
>   -d "emf gef" -o `pwd`/orbitDeps -a "$OPTIONS"
> eclipse-pdebuild -f org.eclipse.datatools.enablement.feature \
>   -d "emf gef" -o `pwd`/orbitDeps -a "$OPTIONS"
>+eclipse-pdebuild -f org.eclipse.datatools.doc.user \
>+  -d "emf gef" -o `pwd`/orbitDeps -a "$OPTIONS"
> 
> %install
> install -d -m 755 %{buildroot}%{eclipse_dropin}
>@@ -164,6 +174,7 @@ unzip -q -d %{buildroot}%{eclipse_dropin}/dtp-modelbase build/rpmBuild/org.eclip
> unzip -q -d %{buildroot}%{eclipse_dropin}/dtp-connectivity build/rpmBuild/org.eclipse.datatools.connectivity.feature.zip
> unzip -q -d %{buildroot}%{eclipse_dropin}/dtp-sqldevtools build/rpmBuild/org.eclipse.datatools.sqldevtools.feature.zip
> unzip -q -d %{buildroot}%{eclipse_dropin}/dtp-enablement build/rpmBuild/org.eclipse.datatools.enablement.feature.zip
>+unzip -d %{buildroot}%{eclipse_dropin}/dtp-doc build/rpmBuild/org.eclipse.datatools.doc.user.zip
> 
> # use system bundles
> pushd %{buildroot}%{eclipse_dropin}/dtp-enablement/eclipse/plugins
>@@ -188,9 +199,13 @@ popd
> %{eclipse_dropin}/dtp-connectivity
> %{eclipse_dropin}/dtp-sqldevtools
> %{eclipse_dropin}/dtp-enablement
>+%{eclipse_dropin}/dtp-doc
> %doc org.eclipse.datatools.build-%{tag}/features/org.eclipse.datatools.sdk-all.feature/rootfiles/*
> 
> %changelog
>+* Fri Jun 20 2014 Gerard Ryan <galileo@fedoraproject.org> - 1.11.2-5
>+- Add feature org.eclipse.datatools.doc.user
>+
> * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.11.2-4
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
> 
>-- 
>1.9.3
>

Actions: View | Diff

Attachments on bug 1111787: 911007