Attachment 904769 Details for Bug 1106194 – Patch

[patch] Patch

0001-Fix-FTBFS-Bug-1106194-and-update-to-latest-packaging.patch (text/plain), 3.07 KB, created by Roland Grunberg on 2014-06-09 15:49:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Roland Grunberg

Created: 2014-06-09 15:49:08 UTC

Size: 3.07 KB

patch

obsolete

>From dce9459a2d1b4786483daf6326db1f112d6a2ac4 Mon Sep 17 00:00:00 2001
>From: Roland Grunberg <rgrunber@redhat.com>
>Date: Mon, 9 Jun 2014 11:44:21 -0400
>Subject: [PATCH] Fix FTBFS (Bug 1106194) and update to latest packaging
> guidelines.
>
>---
> eclipse-eclemma-fix-jacoco-dependency.patch | 26 --------------------------
> eclipse-eclemma.spec                        | 11 +++--------
> 2 files changed, 3 insertions(+), 34 deletions(-)
> delete mode 100644 eclipse-eclemma-fix-jacoco-dependency.patch
>
>diff --git a/eclipse-eclemma-fix-jacoco-dependency.patch b/eclipse-eclemma-fix-jacoco-dependency.patch
>deleted file mode 100644
>index 7148bfa..0000000
>--- a/eclipse-eclemma-fix-jacoco-dependency.patch
>+++ /dev/null
>@@ -1,26 +0,0 @@
>---- com.mountainminds.eclemma.core/META-INF/MANIFEST.MF.bak	2012-05-07 14:26:06.269523320 +0200
>-+++ com.mountainminds.eclemma.core/META-INF/MANIFEST.MF	2012-05-07 14:29:48.949528796 +0200
>-@@ -16,9 +16,9 @@
>-  org.eclipse.debug.core,
>-  org.eclipse.jdt.core,
>-  org.eclipse.jdt.launching,
>-- org.jacoco.core;bundle-version="[0.5.6,0.5.7)",
>-- org.jacoco.agent;bundle-version="[0.5.6,0.5.7)",
>-- org.jacoco.report;bundle-version="[0.5.6,0.5.7)"
>-+ org.jacoco.core;bundle-version="[0.5.6,0.5.8]",
>-+ org.jacoco.agent;bundle-version="[0.5.6,0.5.8]",
>-+ org.jacoco.report;bundle-version="[0.5.6,0.5.8]"
>- Bundle-Activator: com.mountainminds.eclemma.internal.core.EclEmmaCorePlugin
>- Bundle-ActivationPolicy: lazy
>- Bundle-RequiredExecutionEnvironment: J2SE-1.5
>---- com.mountainminds.eclemma.ui/META-INF/MANIFEST.MF.bak	2012-04-10 00:05:36.000000000 +0200
>-+++ com.mountainminds.eclemma.ui/META-INF/MANIFEST.MF	2012-05-07 15:02:52.666835387 +0200
>-@@ -6,7 +6,7 @@
>- Bundle-Vendor: %providerName
>- Bundle-Localization: plugin
>- Require-Bundle: com.mountainminds.eclemma.core,
>-- org.jacoco.core;bundle-version="[0.5.6,0.5.7)",
>-+ org.jacoco.core;bundle-version="[0.5.6,0.5.8)",
>-  org.eclipse.core.runtime,
>-  org.eclipse.core.expressions,
>-  org.eclipse.core.resources,
>diff --git a/eclipse-eclemma.spec b/eclipse-eclemma.spec
>index 1d81f54..5abc38d 100644
>--- a/eclipse-eclemma.spec
>+++ b/eclipse-eclemma.spec
>@@ -41,17 +41,12 @@ find -name '*.jar' -exec rm -f '{}' \;
> %pom_remove_plugin :jacoco-maven-plugin com.mountainminds.eclemma.build/pom.xml
> %pom_remove_dep org.jacoco: com.mountainminds.eclemma.build/pom.xml
> 
>-mkdir -p .m2/p2/repo-sdk/plugins
>-pushd .m2/p2/repo-sdk/plugins
>-	ln -t . -s /usr/share/java/jacoco/*
>-popd
>-
> # Relax version requirement on jacoco
>-sed -i /jacoco/s/0.6.4/0.7.0/ `find -name *.MF`
>+sed -i /jacoco/s/0.7.1/0.8.0/ `find -name *.MF`
> 
> 
> %build
>-mvn-rpmbuild clean install -DskipTychoVersionCheck -Dimplicit-target -DskipTests
>+xmvn -o install -Dimplicit-target -DskipTests
> 
> %install
> install -d -m 755 %{buildroot}/%{install_loc}
>@@ -68,7 +63,7 @@ cat > pom.xml << EOF
> </project>
> EOF
> popd
>-mvn-rpmbuild -f temp/pom.xml org.fedoraproject:feclipse-maven-plugin:install \
>+xmvn -o -f temp/pom.xml org.fedoraproject:feclipse-maven-plugin:install \
> 	-DsourceRepo=../com.mountainminds.eclemma.site/target/repository -DtargetLocation=%{buildroot}%{install_loc}/eclipse
> 
> 
>-- 
>1.9.3
>

Actions: View | Diff

Attachments on bug 1106194: 904148 | 904149 | 904150 | 904769