[eclipse-mylyn-builds/f17] Move to Eclipse 4.2 & Fix Hudson connector.

Krzysztof Daniel kdaniel at fedoraproject.org
Tue Apr 17 13:14:50 UTC 2012 

commit 305d83e055d32511fa0320526b4f52339a9a1921
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date:   Fri Apr 13 11:40:22 2012 +0200

    Move to Eclipse 4.2 & Fix Hudson connector.

 eclipse-mylyn-builds.spec     |   30 ++++++++++++++++--------------
 fix_hudson_feature.patch      |   21 +++++++++++++--------
 remove_hudson_discovery.patch |   17 +++++++++--------
 3 files changed, 38 insertions(+), 30 deletions(-)
---
diff --git a/eclipse-mylyn-builds.spec b/eclipse-mylyn-builds.spec
index 4c1d84f..a778529 100644
--- a/eclipse-mylyn-builds.spec
+++ b/eclipse-mylyn-builds.spec
@@ -7,7 +7,7 @@
 Name: eclipse-mylyn-builds
 Summary: Eclipse Mylyn Builds
 Version: 3.7.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: EPL
 URL: http://www.eclipse.org/mylyn/builds/
 
@@ -27,22 +27,22 @@ Patch2: fix_hudson_feature.patch
 BuildArch: noarch
 
 BuildRequires: java-devel >= 1.6.0
-BuildRequires: eclipse-platform >= 1:3.7.0
-BuildRequires: eclipse-pde >= 1:3.7.0
-BuildRequires: eclipse-mylyn-commons >= 3.7.0
+BuildRequires: eclipse-platform >= 1:4.2.0
+BuildRequires: eclipse-pde >= 1:4.2.0-0.6
+BuildRequires: eclipse-mylyn-commons >= 3.7.0-9
 BuildRequires: eclipse-mylyn >= 3.7.0
 BuildRequires: eclipse-mylyn-context-team >= 3.7.0
 BuildRequires: eclipse-mylyn-versions >= 3.7.0
 BuildRequires: eclipse-emf
 # Required for RestfulHudsonClient.java. However, this will only
 # work with java 1.6 and up, but that's better than not working at all.
-BuildRequires: ws-jaxme
+BuildRequires: ws-jaxme >= 0.5
 # The following is required for javax.xml.stream (apparently openjdk ships it too)
 # not sure what's best here.
 BuildRequires: xml-commons-apis
 BuildRequires: google-gson >= 1.6.0
 Requires: eclipse-mylyn >= 3.7.0
-Requires: eclipse-mylyn-commons >= 3.7.0
+Requires: eclipse-mylyn-commons >= 3.7.0-9
 Requires: eclipse-mylyn-context >= 3.7.0
 Requires: eclipse-emf
 Requires: eclipse-mylyn-versions >= 3.7.0
@@ -58,10 +58,10 @@ build providers using Eclipse Mylyn.
 
 %package hudson
 Summary: Mylyn Builds Connector: Hudson/Jenkins
-Requires: java >= 1:1.6.0
-Requires: eclipse-platform >= 1:3.8.0
-Requires: eclipse-mylyn-commons >= 3.7.0
-Requires: ws-jaxme
+Requires: java >= 1:1.7.0
+Requires: eclipse-platform >= 1:4.2.0-0.6
+Requires: eclipse-mylyn-commons >= 3.7.0-9
+Requires: ws-jaxme >= 0.5
 Requires: google-gson >= 1.6.0
 Requires: %{name} = %{version}-%{release}
 Group: Development/Tools
@@ -83,13 +83,11 @@ popd
 
 
 %build
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.mylyn.builds \
+eclipse-pdebuild -f org.eclipse.mylyn.builds \
  -a "-DjavacSource=1.6 -DjavacTarget=1.6 -DforceContextQualifier=%{qualifier} -DmylynQualifier=%{qualifier}" \
- -j -DJ2SE-1.6=%{_jvmdir}/java/jre/lib/rt.jar \
  -d "mylyn mylyn-commons mylyn-context-team mylyn-context emf mylyn-versions" -o `pwd`/orbitDeps
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.mylyn.hudson \
+eclipse-pdebuild -f org.eclipse.mylyn.hudson \
  -a "-DjavacSource=1.6 -DjavacTarget=1.6 -DforceContextQualifier=%{qualifier} -DmylynQualifier=%{qualifier}" \
- -j -DJavaSE-1.6=%{_jvmdir}/java/jre/lib/rt.jar \
  -d "mylyn-commons" -o `pwd`/orbitDeps
 
 
@@ -125,6 +123,10 @@ popd
 
 
 %changelog
+* Fri Apr 13 2012 Krzysztof Daniel <kdaniel at redhat.com> 3.7.0-2
+- Move to Eclipse 4.2.
+- Fix Hudson connector.
+
 * Tue Mar 27 2012 Krzysztof Daniel <kdaniel at redhat.com> 3.7.0-1
 - Update to upstream 3.7.0. release.
 
diff --git a/fix_hudson_feature.patch b/fix_hudson_feature.patch
index 6d83f3c..ea52042 100644
--- a/fix_hudson_feature.patch
+++ b/fix_hudson_feature.patch
@@ -1,19 +1,24 @@
---- org.eclipse.mylyn.hudson-feature/feature.xml.orig	2012-03-08 11:41:59.000000000 +0100
-+++ org.eclipse.mylyn.hudson-feature/feature.xml	2012-03-27 14:44:58.750736698 +0200
-@@ -29,7 +29,6 @@
+--- org.eclipse.mylyn.hudson-feature/feature.xml.bak	2012-03-08 11:41:59.000000000 +0100
++++ org.eclipse.mylyn.hudson-feature/feature.xml	2012-04-13 11:18:42.746707193 +0200
+@@ -29,12 +29,6 @@
     </license>
  
     <requires>
 -      <import plugin="com.google.gson" version="1.6.0" match="compatible"/>
-       <import plugin="com.sun.xml.bind" version="2.2.0" match="compatible"/>
-       <import plugin="javax.xml" version="1.3.4" match="compatible"/>
-       <import plugin="javax.xml.bind" version="2.1.0" match="compatible"/>
-@@ -51,6 +50,13 @@
+-      <import plugin="com.sun.xml.bind" version="2.2.0" match="compatible"/>
+-      <import plugin="javax.xml" version="1.3.4" match="compatible"/>
+-      <import plugin="javax.xml.bind" version="2.1.0" match="compatible"/>
+-      <import plugin="javax.xml.stream" version="1.0.1" match="compatible"/>
+-      
+       <import feature="org.eclipse.mylyn.builds" version="0.9.0" match="compatible"/>
+       <import feature="org.eclipse.mylyn.commons.repositories.http" version="0.9.0" match="compatible"/>
+    </requires>
+@@ -51,6 +45,13 @@
           download-size="0"
           install-size="0"
           version="0.0.0"
 +         unpack="false"/>
-+
++         
 +   <plugin
 +         id="com.google.gson"
 +         download-size="0"
diff --git a/remove_hudson_discovery.patch b/remove_hudson_discovery.patch
index 50cea87..b0c4cbd 100644
--- a/remove_hudson_discovery.patch
+++ b/remove_hudson_discovery.patch
@@ -12,14 +12,6 @@
 -   </extension>
 -
  </plugin>
---- org.eclipse.mylyn.hudson.ui/META-INF/MANIFEST.MF.bak	2012-03-08 11:41:59.000000000 +0100
-+++ org.eclipse.mylyn.hudson.ui/META-INF/MANIFEST.MF	2012-03-27 14:18:35.118218032 +0200
-@@ -20,5 +20,4 @@
- Bundle-ActivationPolicy: lazy
- Bundle-RequiredExecutionEnvironment: J2SE-1.5
- Bundle-Localization: plugin
--Export-Package: org.eclipse.mylyn.internal.hudson.ui;x-internal:=true
- Bundle-Activator: org.eclipse.mylyn.internal.hudson.ui.HudsonUiPlugin
 --- org.eclipse.mylyn.hudson.ui/src/org/eclipse/mylyn/internal/hudson/ui/HudsonUiPlugin.java.bak	2012-03-08 11:41:59.000000000 +0100
 +++ org.eclipse.mylyn.hudson.ui/src/org/eclipse/mylyn/internal/hudson/ui/HudsonUiPlugin.java	1970-01-01 01:00:00.000000000 +0100
 @@ -1,35 +0,0 @@
@@ -323,3 +315,12 @@
 -	}
 -
 -}
+--- org.eclipse.mylyn.hudson.ui/META-INF/MANIFEST.MF.orig	2012-03-08 11:41:59.000000000 +0100
++++ org.eclipse.mylyn.hudson.ui/META-INF/MANIFEST.MF	2012-04-13 11:31:55.411145074 +0200
+@@ -20,5 +20,4 @@
+ Bundle-ActivationPolicy: lazy
+ Bundle-RequiredExecutionEnvironment: J2SE-1.5
+ Bundle-Localization: plugin
+-Export-Package: org.eclipse.mylyn.internal.hudson.ui;x-internal:=true
+-Bundle-Activator: org.eclipse.mylyn.internal.hudson.ui.HudsonUiPlugin
++

More information about the scm-commits mailing list