[eclipse-mylyn-tasks/f17] Use incubation sources for incubator features.

Krzysztof Daniel kdaniel at fedoraproject.org
Tue Apr 17 13:15:09 UTC 2012 

commit b1d2b2a8e7e48ac0ec7403f81c2eb00094207b8b
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date:   Fri Apr 13 11:00:39 2012 +0200

    Use incubation sources for incubator features.

 eclipse-mylyn-tasks-remove-javax.patch |   11 ++++++++
 eclipse-mylyn-tasks.spec               |   44 ++++++++++++++++---------------
 fetch-eclipse-mylyn-tasks.sh           |    2 +-
 sources                                |    2 +-
 4 files changed, 36 insertions(+), 23 deletions(-)
---
diff --git a/eclipse-mylyn-tasks-remove-javax.patch b/eclipse-mylyn-tasks-remove-javax.patch
new file mode 100644
index 0000000..6a53e10
--- /dev/null
+++ b/eclipse-mylyn-tasks-remove-javax.patch
@@ -0,0 +1,11 @@
+--- org.eclipse.mylyn.bugzilla-feature/feature.xml.bak	2012-03-16 10:42:08.000000000 +0100
++++ org.eclipse.mylyn.bugzilla-feature/feature.xml	2012-04-13 10:21:14.417113498 +0200
+@@ -33,8 +33,6 @@
+       <import plugin="org.eclipse.mylyn.commons.xmlrpc" version="3.7.0" match="compatible"/>
+       <import plugin="org.apache.xmlrpc" version="3.0.0" match="compatible"/>
+       <import plugin="org.apache.ws.commons.util" version="1.0.1" match="compatible"/>
+-      <import plugin="javax.xml.bind" version="2.0.0" match="compatible"/>
+-      <import plugin="javax.xml.stream" version="1.0.1" match="compatible"/>
+       
+       <import feature="org.eclipse.mylyn_feature" version="3.7.0" match="equivalent"/>
+    </requires>
diff --git a/eclipse-mylyn-tasks.spec b/eclipse-mylyn-tasks.spec
index 567ff11..4f881aa 100644
--- a/eclipse-mylyn-tasks.spec
+++ b/eclipse-mylyn-tasks.spec
@@ -1,4 +1,3 @@
-%global eclipse_base        %{_libdir}/eclipse
 %global install_loc         %{_datadir}/eclipse/dropins
 # Taken from update site so we match upstream
 #  http://download.eclipse.org/mylyn/archive/3.6.0/v20110608-1400/
@@ -7,7 +6,7 @@
 Name: eclipse-mylyn-tasks
 Summary: Mylyn Bugzilla/Trac Tasks Connectors
 Version: 3.7.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: EPL
 URL: http://www.eclipse.org/mylyn/tasks
 
@@ -28,17 +27,18 @@ Source2: redhat-bugzilla-custom-transitions.txt
 # bugzilla.core and trac.core MANIFEST.MF
 Patch0: %{name}-bugzilla-core-xmlrpc-import-package-manifest-fix.patch
 Patch1: %{name}-trac-core-xmlrpc-import-package-manifest-fix.patch
+Patch2: %{name}-remove-javax.patch
 
 BuildRequires: java-devel >= 1.5.0
-BuildRequires: eclipse-platform >= 1:3.8.0
-BuildRequires: eclipse-pde >= 1:3.8.0
+BuildRequires: eclipse-platform >= 1:4.2.0
+BuildRequires: eclipse-pde >= 1:4.2.0-0.6
 BuildRequires: eclipse-mylyn >= 3.7.0
-BuildRequires: eclipse-mylyn-commons >= 3.7.0
+BuildRequires: eclipse-mylyn-commons >= 3.7.0-0.9
 BuildRequires: eclipse-mylyn-context >= 3.7.0
 BuildRequires: google-gson = 1.7.1
 # The following two are required for webtasks
-BuildRequires: rome
-BuildRequires: jdom
+BuildRequires: rome >= 0.9-9
+BuildRequires: jdom >= 1.1.2-3
 
 %description
 Mylyn Tasks Connectors
@@ -48,9 +48,9 @@ Mylyn Tasks Connectors
 
 %package bugzilla
 Summary: Mylyn Tasks Connector: Bugzilla
-Requires: eclipse-platform >= 1:3.8.0
+Requires: eclipse-platform >= 1:4.2.0
 Requires: eclipse-mylyn >= 3.7.0
-Requires: eclipse-mylyn-commons >= 3.7.0
+Requires: eclipse-mylyn-commons >= 3.7.0-9
 Provides: eclipse-mylyn-bugzilla = %{version}-%{release}
 Obsoletes: eclipse-mylyn-bugzilla < %{version}-%{release}
 Group: Development/Tools
@@ -64,9 +64,9 @@ open source Bugzilla bug tracker.
 
 %package  trac
 Summary: Mylyn Tasks Connector: Trac
-Requires: eclipse-platform >= 1:3.8.0
+Requires: eclipse-platform >= 1:4.2.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: google-gson
 Group: Development/Tools
@@ -82,11 +82,11 @@ for the open source Trac issue tracker.
 
 %package  web
 Summary: Mylyn Tasks Connector: Web Templates (Advanced) (Incubation)
-Requires: eclipse-platform >= 1:3.8.0
+Requires: eclipse-platform >= 1:4.2.0
 Requires: eclipse-mylyn >= 3.7.0
-Requires: eclipse-mylyn-commons >= 3.7.0
-Requires: rome
-Requires: jdom
+Requires: eclipse-mylyn-commons >= 3.7.0-9
+Requires: rome >= 0.9-9
+Requires: jdom >= 1.1.2-3
 Group: Development/Tools
 Provides: eclipse-mylyn-webtasks = %{version}-%{release}
 Obsoletes: eclipse-mylyn-webtasks < %{version}-%{release}
@@ -101,6 +101,7 @@ and templates for example projects.
 pushd eclipse-mylyn-tasks-R_3_7_0-fetched-src
 %patch0
 %patch1
+%patch2
 rm -rf orbitDeps
 mkdir orbitDeps
 pushd orbitDeps
@@ -111,18 +112,15 @@ popd
 
 %build
 pushd eclipse-mylyn-tasks-R_3_7_0-fetched-src
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.mylyn.bugzilla_feature \
+eclipse-pdebuild -f org.eclipse.mylyn.bugzilla_feature \
  -a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier} -DmylynQualifier=%{qualifier}" \
- -j -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar \
  -d "mylyn mylyn-commons"
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.mylyn.trac_feature \
+eclipse-pdebuild -f org.eclipse.mylyn.trac_feature \
  -a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier} -DmylynQualifier=%{qualifier}" \
- -j -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar \
  -d "mylyn mylyn-commons mylyn-context" \
  -o `pwd`/orbitDeps
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.mylyn.web.tasks_feature \
+eclipse-pdebuild -f org.eclipse.mylyn.web.tasks_feature \
  -a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier} -DmylynQualifier=%{qualifier}" \
- -j -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar \
  -d "mylyn mylyn-commons" -o `pwd`/orbitDeps
 popd
 
@@ -175,6 +173,10 @@ popd
 
 
 %changelog
+* Fri Apr 13 2012 Krzysztof Daniel <kdaniel at redhat.com> 3.7.0-2
+- Use master sources for incubator features.
+- Move to Eclipse 4.2.
+
 * Tue Mar 27 2012 Krzysztof Daniel <kdaniel at redhat.com> 3.7.0-1
 - Update to upstream 3.7.0 version.
 
diff --git a/fetch-eclipse-mylyn-tasks.sh b/fetch-eclipse-mylyn-tasks.sh
index a658144..a3d37d9 100755
--- a/fetch-eclipse-mylyn-tasks.sh
+++ b/fetch-eclipse-mylyn-tasks.sh
@@ -6,7 +6,7 @@
 #  - org.eclipse.mylyn.web.tasks-feature (incubation)
 # 
 RELEASE_TAG="R_3_7_0"
-INCUBATOR_RELEASE_TAG="R_3_6_5"
+INCUBATOR_RELEASE_TAG="5dae8d9376fecdd04f604d9ee3398415fd4e888c"
 
 rm -rf org.eclipse.mylyn.tasks.tar.bz2
 rm -rf org.eclipse.mylyn.incubator.tar.bz2
diff --git a/sources b/sources
index 15dda0c..4ddfddd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5a97f121d32ff7dbe8b3a8bef2d2e613  eclipse-mylyn-tasks-R_3_7_0-fetched-src.tar.bz2
+68581ca0ab6a7c697f9f4724122a8ebe  eclipse-mylyn-tasks-R_3_7_0-fetched-src.tar.bz2

More information about the scm-commits mailing list