diff --git a/.cvsignore b/.cvsignore
index 1d5a349..e1b6000 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1,3 @@
fedoraeclipse-mylynbugzilla-0.0.2.zip
org.eclipse.mylyn
-org.eclipse.mylyn-R_2_3_2_e_3_3-fetched-src.tar.bz2
+org.eclipse.mylyn-R_3_0_1-fetched-src.tar.bz2
diff --git a/eclipse-mylyn-nojaxb.patch b/eclipse-mylyn-nojaxb.patch
new file mode 100644
index 0000000..e3ef765
--- /dev/null
+++ b/eclipse-mylyn-nojaxb.patch
@@ -0,0 +1,15 @@
+diff -up ./org.eclipse.mylyn.trac-feature/feature.xml.nojaxb ./org.eclipse.mylyn.trac-feature/feature.xml
+--- ./org.eclipse.mylyn.trac-feature/feature.xml.nojaxb 2008-07-29 14:47:21.000000000 -0400
++++ ./org.eclipse.mylyn.trac-feature/feature.xml 2008-07-29 14:47:30.000000000 -0400
+@@ -108,11 +108,4 @@ Java and all Java-based trademarks are t
+ version="0.0.0"
+ unpack="false"/>
+
+-
+-
+
diff --git a/eclipse-mylyn-splitxmlrpc.patch b/eclipse-mylyn-splitxmlrpc.patch
new file mode 100644
index 0000000..09f2fa0
--- /dev/null
+++ b/eclipse-mylyn-splitxmlrpc.patch
@@ -0,0 +1,16 @@
+diff -up ./org.eclipse.mylyn.trac.core/META-INF/MANIFEST.MF.splitxmlrpc ./org.eclipse.mylyn.trac.core/META-INF/MANIFEST.MF
+--- ./org.eclipse.mylyn.trac.core/META-INF/MANIFEST.MF.splitxmlrpc 2008-07-29 15:09:19.000000000 -0400
++++ ./org.eclipse.mylyn.trac.core/META-INF/MANIFEST.MF 2008-07-29 15:42:17.000000000 -0400
+@@ -8,8 +8,10 @@ Require-Bundle: org.eclipse.core.runtime
+ org.eclipse.mylyn.context.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.mylyn.tasks.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.mylyn.commons.core;bundle-version="[3.0.0,4.0.0)",
+- org.eclipse.mylyn.commons.net;bundle-version="[3.0.0,4.0.0)",
+- org.apache.xmlrpc;bundle-version="[3.0.0,4.0.0)"
++ org.eclipse.mylyn.commons.net;bundle-version="[3.0.0,4.0.0)"
++Import-Package: org.apache.xmlrpc.client,
++ org.apache.xmlrpc.common,
++ org.apache.xmlrpc.util
+ Bundle-ActivationPolicy: lazy
+ Export-Package: org.eclipse.mylyn.internal.trac.core;x-friends:="org.eclipse.mylyn.trac.ui",
+ org.eclipse.mylyn.internal.trac.core.client;x-friends:="org.eclipse.mylyn.trac.ui",
diff --git a/eclipse-mylyn-unpackwebcore.patch b/eclipse-mylyn-unpackwebcore.patch
deleted file mode 100644
index f77ca1b..0000000
--- a/eclipse-mylyn-unpackwebcore.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-### Eclipse Workspace Patch 1.0
-#P org.eclipse.mylyn-feature
-Index: feature.xml
-===================================================================
-RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn-feature/feature.xml,v
-retrieving revision 1.382.2.16
-diff -u -r1.382.2.16 feature.xml
---- feature.xml 1 Apr 2008 22:02:47 -0000 1.382.2.16
-+++ feature.xml 4 Apr 2008 15:50:34 -0000
-@@ -144,7 +144,7 @@
- download-size="0"
- install-size="0"
- version="2.3.2.qualifier"
-- unpack="false"/>
-+ unpack="true"/>
-
-
-
-
-+
-
-
-
-@@ -9,7 +10,6 @@
-
-
-
--
-
-
-
-Index: build.properties
-===================================================================
-RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.web.core/build.properties,v
-retrieving revision 1.7
-diff -u -r1.7 build.properties
---- build.properties 3 Jan 2008 01:54:46 -0000 1.7
-+++ build.properties 4 Apr 2008 15:31:44 -0000
-@@ -5,10 +5,10 @@
- # which accompanies this distribution, and is available at
- # http://www.eclipse.org/legal/epl-v10.html
- ###############################################################################
--source.. = src/
--output.. = bin/
-+source.mylyn-webcore.jar = src/
-+output.mylyn-webcore.jar = bin/
- bin.includes = META-INF/,\
-- .,\
-+ mylyn-webcore.jar,\
- lib-xmlrpc/,\
- lib-rome/,\
- lib-httpclient/,\
-Index: META-INF/MANIFEST.MF
-===================================================================
-RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.web.core/META-INF/MANIFEST.MF,v
-retrieving revision 1.53.2.2
-diff -u -r1.53.2.2 MANIFEST.MF
---- META-INF/MANIFEST.MF 1 Apr 2008 22:02:30 -0000 1.53.2.2
-+++ META-INF/MANIFEST.MF 4 Apr 2008 15:31:44 -0000
-@@ -8,7 +8,7 @@
- Bundle-RequiredExecutionEnvironment: J2SE-1.5
- Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.net
--Bundle-ClassPath: .,
-+Bundle-ClassPath: mylyn-webcore.jar,
- lib-httpclient/commons-httpclient-3.1.jar,
- lib-httpclient/commons-codec-1.3.jar,
- lib-httpclient/commons-logging-1.0.4.jar,
-@@ -16,22 +16,9 @@
- lib-xmlrpc/xmlrpc-client-3.0.jar,
- lib-xmlrpc/xmlrpc-common-3.0.jar,
- lib-xmlrpc/ws-commons-util-1.0.1.jar,
-- lib-rome/rome-0.8.jar,
- lib-rome/jdom-1.0.jar,
- lib-lang/commons-lang-2.1.jar
- Export-Package: .,
-- com.sun.syndication,
-- com.sun.syndication.feed,
-- com.sun.syndication.feed.atom,
-- com.sun.syndication.feed.impl,
-- com.sun.syndication.feed.module,
-- com.sun.syndication.feed.module.impl,
-- com.sun.syndication.feed.rss,
-- com.sun.syndication.feed.sse,
-- com.sun.syndication.feed.synd,
-- com.sun.syndication.feed.synd.impl,
-- com.sun.syndication.io,
-- com.sun.syndication.io.impl,
- org.apache.commons.codec,
- org.apache.commons.codec.binary,
- org.apache.commons.codec.digest,
diff --git a/eclipse-mylyn.spec b/eclipse-mylyn.spec
index 2917b79..eef530a 100644
--- a/eclipse-mylyn.spec
+++ b/eclipse-mylyn.spec
@@ -1,46 +1,38 @@
-%define gcj_support 1
-%define eclipse_base %{_datadir}/eclipse
+%define eclipse_base %{_libdir}/eclipse
+# Taken from update site so we match upstream
+# http://download.eclipse.org/tools/mylyn/update/e3.4/
+%define qualifier v20080716-2300-e3x
Name: eclipse-mylyn
Summary: Mylyn is a task-focused UI for Eclipse
-Version: 2.3.2
-Release: 6%{?dist}
+Version: 3.0.1
+Release: 1%{?dist}
License: EPL
URL: http://www.eclipse.org/mylyn
-# no xmlrpc3 on ppc64 due to:
-# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=239123
-ExcludeArch: ppc64
-
# mkdir temp && cd temp
# sh fetch-mylyn.sh
-# tar cjf org.eclipse.mylyn-R_2_3_2_e_3_3-fetched-src.tar.bz2 org.eclipse.mylyn
-Source0: org.eclipse.mylyn-R_2_3_2_e_3_3-fetched-src.tar.bz2
+# tar cjf org.eclipse.mylyn-R_3_0_1-fetched-src.tar.bz2 org.eclipse.mylyn
+Source0: org.eclipse.mylyn-R_3_0_1-fetched-src.tar.bz2
Source1: fetch-mylyn.sh
Source2: http://overholt.fedorapeople.org/fedoraeclipse-mylynbugzilla-0.0.2.zip
-# So we can symlink to dependencies
-Patch4: %{name}-unpackwebcore.patch
-Patch5: %{name}-webcorejar.patch
Patch6: %{name}-addfedoracustomizations.patch
+# This is a dependency declared by the Orbit xmlrpc JAR. We don't use
+# their JAR and the part of Mylyn using xmlrpc isn't using the
+# javax.xml.bind-using part(s) of xmlrpc.
+Patch7: %{name}-nojaxb.patch
+# Our xmlrpc packages are split into JARs differently than Orbit
+Patch8: %{name}-splitxmlrpc.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-%if %{gcj_support}
-BuildRequires: gcc-java
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
-%else
BuildRequires: java-devel >= 1.5.0
-%endif
-%if ! %{gcj_support}
BuildArch: noarch
-%endif
-BuildRequires: eclipse-pde >= 1:3.3.2
-BuildRequires: eclipse-cvs-client >= 1:3.3.2
+BuildRequires: eclipse-pde >= 1:3.4.0
+BuildRequires: eclipse-cvs-client >= 1:3.4.0
BuildRequires: jakarta-commons-codec >= 1.3-8jpp.2
BuildRequires: jakarta-commons-httpclient >= 1:3.1
BuildRequires: jakarta-commons-logging
@@ -48,8 +40,10 @@ BuildRequires: jakarta-commons-lang >= 2.1
BuildRequires: ws-commons-util >= 1.0.1-5
BuildRequires: xmlrpc3-client >= 3.0-1jpp.3
BuildRequires: xmlrpc3-common >= 3.0-1jpp.3
-Requires: eclipse-platform >= 1:3.3.0
-Requires: eclipse-cvs-client >= 1:3.3.0
+BuildRequires: rome
+BuildRequires: jdom
+Requires: eclipse-platform >= 1:3.4.0
+Requires: eclipse-cvs-client >= 1:3.4.0
Requires: jakarta-commons-codec >= 1.3-8jpp.2
Requires: jakarta-commons-httpclient >= 1:3.1
Requires: jakarta-commons-logging
@@ -57,6 +51,8 @@ Requires: jakarta-commons-lang >= 2.1
Requires: ws-commons-util >= 1.0.1-2
Requires: xmlrpc3-client >= 3.0-1jpp.3
Requires: xmlrpc3-common >= 3.0-1jpp.3
+Requires: rome
+Requires: jdom
Provides: eclipse-mylar = 2.0.0-1.fc7
Obsoletes: eclipse-mylar < 2.0.0
@@ -125,287 +121,133 @@ Mylyn Task-Focused UI extensions for PDE, Ant, Team Support and CVS.
%setup -q -n org.eclipse.mylyn
unzip -q %{SOURCE2}
-# FIXME: file these upstream
-sed --in-place "s/@Override//" \
- org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/commands/FocusViewHandler.java \
- org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/commands/AddTaskRepositoryHandler.java
-
-# So we can symlink to jars from another package
-pushd org.eclipse.mylyn.web.core
-%patch5
+# The tests have dependencies we don't need/want/have
+rm -rf *tests*
+
+mkdir orbitDeps
+pushd orbitDeps
+ln -s %{_javadir}/commons-codec-1.3.jar org.apache.commons.codec_1.3.0.jar
+ln -s %{_javadir}/commons-httpclient.jar org.apache.commons.httpclient_3.1.0.jar
+ln -s %{_javadir}/commons-lang.jar org.apache.commons.lang_2.3.0.jar
+ln -s %{_javadir}/commons-logging-api.jar org.apache.commons.logging.api_1.0.4.jar
+ln -s %{_javadir}/commons-logging.jar org.apache.commons.logging_1.0.4.jar
+ln -s %{_javadir}/xmlrpc3-client-3.0.jar org.apache.xmlrpc.client_3.0.0.v20080530-1550.jar
+ln -s %{_javadir}/xmlrpc3-common-3.0.jar org.apache.xmlrpc.common_3.0.0.v20080530-1550.jar
+ln -s %{_javadir}/ws-commons-util-1.0.1.jar org.apache.ws.commons.util_1.0.0.v20080530-1550.jar
+ln -s %{_javadir}/jdom-1.0.jar org.jdom_1.0.0.v200806100616.jar
+ln -s %{_javadir}/rome-0.9.jar com.sun.syndication_0.9.0.v200803061811.jar
popd
-# So we can symlink to dependencies
-pushd org.eclipse.mylyn-feature
-%patch4
-popd
-
-# symlink out to jars we built
-pushd org.eclipse.mylyn.web.core/lib-httpclient
-rm commons-*.jar
-ln -s %{_javadir}/commons-codec-1.3.jar
-ln -s %{_javadir}/commons-httpclient.jar commons-httpclient-3.1.jar
-ln -s %{_javadir}/commons-logging-api.jar commons-logging-api-1.0.4.jar
-ln -s %{_javadir}/commons-logging.jar commons-logging-1.0.4.jar
-popd
-pushd org.eclipse.mylyn.web.core/lib-xmlrpc
-rm ws-commons-*.jar
-rm xmlrpc*.jar
-ln -s %{_javadir}/xmlrpc3-client-3.0.jar xmlrpc-client-3.0.jar
-ln -s %{_javadir}/xmlrpc3-common-3.0.jar xmlrpc-common-3.0.jar
-ln -s %{_javadir}/ws-commons-util-1.0.1.jar
-popd
-pushd org.eclipse.mylyn.web.core/lib-rome
-rm *.jar
-ln -s %{_javadir}/jdom-1.0.jar
-popd
-pushd org.eclipse.mylyn.web.core/lib-lang
-rm *.jar
-ln -s %{_javadir}/commons-lang.jar commons-lang-2.1.jar
-popd
+#javax.activation_1.1.0.v200806101325.jar
+#javax.xml.bind_2.0.0.v20080604-1500.jar
+#javax.mail_1.4.0.v200804091730.jar
+#javax.servlet_2.4.0.v200806031604.jar
+#org.apache.ant_1.7.0.v200803061910.zip,unpack=true
+#javax.xml.rpc_1.1.0.v200806030420.zip,unpack=true
+#javax.wsdl_1.5.1.v200806030408.jar
+#javax.xml.soap_1.2.0.v200806030421.zip,unpack=true
+#org.apache.axis_1.4.0.v200806030120.zip,unpack=true
+#org.apache.commons.discovery_0.2.0.v200806030120.zip,unpack=true
pushd org.eclipse.mylyn.bugzilla-feature
%patch6
popd
+%patch7
+%patch8
%build
%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.mylyn_feature \
- -a "-DjavacSource=1.5 -DjavacTarget=1.5" \
- -j -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.mylyn.bugzilla_feature \
- -a "-DjavacSource=1.5 -DjavacTarget=1.5" \
- -j -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar
+ -a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier}" \
+ -j -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar \
+ -o `pwd`/orbitDeps
%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.mylyn.context_feature \
- -a "-DjavacSource=1.5 -DjavacTarget=1.5" \
- -j -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar
+ -a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier}" \
+ -j -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar \
+ -o `pwd`/orbitDeps
+%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.mylyn.team_feature \
+ -a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier}" \
+ -j -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar \
+ -o `pwd`/orbitDeps
+%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.mylyn.bugzilla_feature \
+ -a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier}" \
+ -j -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar \
+ -o `pwd`/orbitDeps
%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.mylyn.ide_feature \
- -a "-DjavacSource=1.5 -DjavacTarget=1.5" \
- -j -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar
+ -a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier}" \
+ -j -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar \
+ -o `pwd`/orbitDeps
%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.mylyn.trac_feature \
- -a "-DjavacSource=1.5 -DjavacTarget=1.5" \
- -j -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar
+ -a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier}" \
+ -j -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar \
+ -o `pwd`/orbitDeps
%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.mylyn.java_feature \
- -a "-DjavacSource=1.5 -DjavacTarget=1.5" \
- -j -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar
+ -a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier}" \
+ -j -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar \
+ -o `pwd`/orbitDeps
%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.mylyn.pde_feature \
- -a "-DjavacSource=1.5 -DjavacTarget=1.5" \
- -j -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar
+ -a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier}" \
+ -j -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar \
+ -o `pwd`/orbitDeps
%install
rm -rf %{buildroot}
-install -d -m 755 $RPM_BUILD_ROOT%{eclipse_base}
-unzip -q -d $RPM_BUILD_ROOT%{eclipse_base}/.. \
+install -d -m 755 $RPM_BUILD_ROOT%{eclipse_base}/dropins
+
+unzip -q -d $RPM_BUILD_ROOT%{eclipse_base}/dropins/mylyn \
build/rpmBuild/org.eclipse.mylyn_feature.zip
-unzip -q -d $RPM_BUILD_ROOT%{eclipse_base}/.. \
+unzip -q -d $RPM_BUILD_ROOT%{eclipse_base}/dropins/mylyn-bugzilla \
build/rpmBuild/org.eclipse.mylyn.bugzilla_feature.zip
-unzip -q -d $RPM_BUILD_ROOT%{eclipse_base}/.. \
+unzip -q -d $RPM_BUILD_ROOT%{eclipse_base}/dropins/mylyn-context \
build/rpmBuild/org.eclipse.mylyn.context_feature.zip
-unzip -q -d $RPM_BUILD_ROOT%{eclipse_base}/.. \
+unzip -q -d $RPM_BUILD_ROOT%{eclipse_base}/dropins/mylyn-ide \
build/rpmBuild/org.eclipse.mylyn.ide_feature.zip
-unzip -q -d $RPM_BUILD_ROOT%{eclipse_base}/.. \
+unzip -q -d $RPM_BUILD_ROOT%{eclipse_base}/dropins/mylyn-trac \
build/rpmBuild/org.eclipse.mylyn.trac_feature.zip
-unzip -q -d $RPM_BUILD_ROOT%{eclipse_base}/.. \
+unzip -q -d $RPM_BUILD_ROOT%{eclipse_base}/dropins/mylyn-java \
build/rpmBuild/org.eclipse.mylyn.java_feature.zip
-unzip -q -d $RPM_BUILD_ROOT%{eclipse_base}/.. \
+unzip -q -d $RPM_BUILD_ROOT%{eclipse_base}/dropins/mylyn-pde \
build/rpmBuild/org.eclipse.mylyn.pde_feature.zip
-# symlink
-pushd $RPM_BUILD_ROOT%{eclipse_base}/plugins/org.eclipse.mylyn.web.core_*/lib-httpclient
-rm commons-*.jar
-ln -s %{_javadir}/commons-codec-1.3.jar
-ln -s %{_javadir}/commons-httpclient.jar commons-httpclient-3.1.jar
-ln -s %{_javadir}/commons-logging-api.jar commons-logging-api-1.0.4.jar
-ln -s %{_javadir}/commons-logging.jar commons-logging-1.0.4.jar
-popd
-pushd $RPM_BUILD_ROOT%{eclipse_base}/plugins/org.eclipse.mylyn.web.core_*/lib-xmlrpc
-rm ws-commons-*.jar
-rm xmlrpc*.jar
-ln -s %{_javadir}/xmlrpc3-client-3.0.jar xmlrpc-client-3.0.jar
-ln -s %{_javadir}/xmlrpc3-common-3.0.jar xmlrpc-common-3.0.jar
-ln -s %{_javadir}/ws-commons-util-1.0.1.jar
-popd
-pushd $RPM_BUILD_ROOT%{eclipse_base}/plugins/org.eclipse.mylyn.web.core_*/lib-rome
-ln -s %{_javadir}/jdom-1.0.jar
-popd
-pushd $RPM_BUILD_ROOT%{eclipse_base}/plugins/org.eclipse.mylyn.web.core_*/lib-lang
-rm *.jar
-ln -s %{_javadir}/commons-lang.jar commons-lang-2.1.jar
-popd
-
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm
-%endif
-
%clean
rm -rf %{buildroot}
-%if %{gcj_support}
-%post
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-
-%postun
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-
-%post bugzilla
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-
-%postun bugzilla
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-
-%post ide
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-
-%postun ide
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-
-%post trac
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-
-%postun trac
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-
-%post java
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-
-%postun java
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
%files bugzilla
%defattr(-,root,root,-)
-%{eclipse_base}/plugins/org.eclipse.mylyn.bugzilla.core_*.jar
-%{eclipse_base}/plugins/org.eclipse.mylyn.bugzilla.ui_*.jar
-%{eclipse_base}/plugins/org.fedoraproject.mylyn.bugzilla_*.jar
-%dir %{eclipse_base}/features/org.eclipse.mylyn.bugzilla_feature_*
-%doc %{eclipse_base}/features/org.eclipse.mylyn.bugzilla_feature_*/license.html
-%doc %{eclipse_base}/features/org.eclipse.mylyn.bugzilla_feature_*/about.html
-%doc %{eclipse_base}/features/org.eclipse.mylyn.bugzilla_feature_*/epl-v10.html
-%{eclipse_base}/features/org.eclipse.mylyn.bugzilla_feature_*/feature.xml
-%if %{gcj_support}
-%{_libdir}/gcj/%{name}/org.eclipse.mylyn.bugzilla*
-%{_libdir}/gcj/%{name}/org.fedoraproject.mylyn.bugzilla*
-%endif
+%{eclipse_base}/dropins/mylyn-bugzilla
%files ide
%defattr(-,root,root,-)
-%{eclipse_base}/plugins/org.eclipse.mylyn.ide.ui_*.jar
-%dir %{eclipse_base}/features/org.eclipse.mylyn.ide_feature_*
-%doc %{eclipse_base}/features/org.eclipse.mylyn.ide_feature_*/license.html
-%doc %{eclipse_base}/features/org.eclipse.mylyn.ide_feature_*/epl-v10.html
-%{eclipse_base}/features/org.eclipse.mylyn.ide_feature_*/feature.xml
-%if %{gcj_support}
-%{_libdir}/gcj/%{name}/org.eclipse.mylyn.ide.ui_*
-%endif
+%{eclipse_base}/dropins/mylyn-ide
%files trac
%defattr(-,root,root,-)
-%{eclipse_base}/plugins/org.eclipse.mylyn.trac.core_*.jar
-%{eclipse_base}/plugins/org.eclipse.mylyn.trac.ui_*.jar
-%dir %{eclipse_base}/features/org.eclipse.mylyn.trac_feature_*
-%{eclipse_base}/features/org.eclipse.mylyn.trac_feature_*/feature.xml
-%if %{gcj_support}
-%{_libdir}/gcj/%{name}/org.eclipse.mylyn.trac*
-%endif
+%{eclipse_base}/dropins/mylyn-trac
%files java
%defattr(-,root,root,-)
-%{eclipse_base}/plugins/org.eclipse.mylyn.java.ui_*.jar
-%dir %{eclipse_base}/features/org.eclipse.mylyn.java_feature_*
-%doc %{eclipse_base}/features/org.eclipse.mylyn.java_feature_*/license.html
-%doc %{eclipse_base}/features/org.eclipse.mylyn.java_feature_*/epl-v10.html
-%{eclipse_base}/features/org.eclipse.mylyn.java_feature_*/feature.xml
-%if %{gcj_support}
-%{_libdir}/gcj/%{name}/org.eclipse.mylyn.java*
-%endif
+%{eclipse_base}/dropins/mylyn-java
%files pde
%defattr(-,root,root,-)
-%{eclipse_base}/plugins/org.eclipse.mylyn.team.ui_*.jar
-%{eclipse_base}/plugins/org.eclipse.mylyn.team.cvs_*.jar
-%{eclipse_base}/plugins/org.eclipse.mylyn.bugzilla.ide_*.jar
-%{eclipse_base}/plugins/org.eclipse.mylyn.ide.ant_*.jar
-%{eclipse_base}/plugins/org.eclipse.mylyn.pde.ui_*.jar
-%dir %{eclipse_base}/features/org.eclipse.mylyn.pde_feature_*
-%doc %{eclipse_base}/features/org.eclipse.mylyn.pde_feature_*/license.html
-%doc %{eclipse_base}/features/org.eclipse.mylyn.pde_feature_*/epl-v10.html
-%{eclipse_base}/features/org.eclipse.mylyn.pde_feature_*/feature.xml
-%if %{gcj_support}
-%{_libdir}/gcj/%{name}/org.eclipse.mylyn.pde.ui*
-%{_libdir}/gcj/%{name}/org.eclipse.mylyn.team.ui*
-%{_libdir}/gcj/%{name}/org.eclipse.mylyn.team.cvs*
-%{_libdir}/gcj/%{name}/org.eclipse.mylyn.bugzilla.ide*
-%{_libdir}/gcj/%{name}/org.eclipse.mylyn.ide.ant*
-%endif
+%{eclipse_base}/dropins/mylyn-pde
%files
%defattr(-,root,root,-)
-%{eclipse_base}/plugins/org.eclipse.mylyn.help.ui_*.jar
-%{eclipse_base}/plugins/org.eclipse.mylyn.web.core_*
-%{eclipse_base}/plugins/org.eclipse.mylyn.compatibility_*.jar
-%{eclipse_base}/plugins/org.eclipse.mylyn.context.core_*.jar
-%{eclipse_base}/plugins/org.eclipse.mylyn.tasks.ui_*.jar
-%{eclipse_base}/plugins/org.eclipse.mylyn.tasks.core_*.jar
-%{eclipse_base}/plugins/org.eclipse.mylyn_*.jar
-%{eclipse_base}/plugins/org.eclipse.mylyn.monitor.core_*.jar
-%{eclipse_base}/plugins/org.eclipse.mylyn.monitor.ui_*.jar
-%doc %{eclipse_base}/features/org.eclipse.mylyn_feature_*/license.html
-%doc %{eclipse_base}/features/org.eclipse.mylyn_feature_*/epl-v10.html
-%{eclipse_base}/features/org.eclipse.mylyn_feature_*/feature.xml
-%doc %{eclipse_base}/features/org.eclipse.mylyn.context_feature_*/license.html
-%doc %{eclipse_base}/features/org.eclipse.mylyn.context_feature_*/epl-v10.html
-%{eclipse_base}/features/org.eclipse.mylyn.context_feature_*/feature.xml
-%{eclipse_base}/plugins/org.eclipse.mylyn.context.ui_*.jar
-%{eclipse_base}/plugins/org.eclipse.mylyn.web.ui_*.jar
-%{eclipse_base}/plugins/org.eclipse.mylyn.resources.ui_*.jar
-%if %{gcj_support}
-%{_libdir}/gcj/%{name}/org.eclipse.mylyn.help.ui_*
-%{_libdir}/gcj/%{name}/mylyn-webcore*
-%{_libdir}/gcj/%{name}/org.eclipse.mylyn.compatibility_*
-%{_libdir}/gcj/%{name}/org.eclipse.mylyn.context.core_*
-%{_libdir}/gcj/%{name}/org.eclipse.mylyn.tasks.ui_*
-%{_libdir}/gcj/%{name}/org.eclipse.mylyn.tasks.core_*
-%{_libdir}/gcj/%{name}/org.eclipse.mylyn.monitor.core_*
-%{_libdir}/gcj/%{name}/org.eclipse.mylyn.monitor.ui_*
-%{_libdir}/gcj/%{name}/org.eclipse.mylyn.context.ui_*
-%{_libdir}/gcj/%{name}/org.eclipse.mylyn.resources.ui_*
-%{_libdir}/gcj/%{name}/org.eclipse.mylyn.web.ui_*
-%dir %{_libdir}/gcj/%{name}
-%endif
+%{eclipse_base}/dropins/mylyn
+%{eclipse_base}/dropins/mylyn-context
%changelog
+* Wed Jul 30 2008 Andrew Overholt 3.0.1-1
+- 3.0.1
+- Add patch to not require jaxb (required by XML-RPC Orbit bundle)
+
* Thu Jul 17 2008 Tom "spot" Callaway 2.3.2-6
- fix license tag
+* Wed May 14 2008 Andrew Overholt 2.3.2-6
+- ".qualifier" -> actual release qualifier in build (due to upstream
+ build system change (e.o#108291, rh#446468).
+
* Tue Apr 15 2008 Andrew Overholt 2.3.2-5
- Re-build to attempt to fix rhbz#442251 (broken cpio archive).
diff --git a/fetch-mylyn.sh b/fetch-mylyn.sh
index 99ec1f2..21281b2 100644
--- a/fetch-mylyn.sh
+++ b/fetch-mylyn.sh
@@ -2,49 +2,54 @@
for f in \
org.eclipse.mylyn \
-org.eclipse.mylyn-feature \
-org.eclipse.mylyn.compatibility \
-org.eclipse.mylyn.bugzilla-feature \
org.eclipse.mylyn.bugzilla.core \
+org.eclipse.mylyn.bugzilla-feature \
org.eclipse.mylyn.bugzilla.ide \
org.eclipse.mylyn.bugzilla.tests \
org.eclipse.mylyn.bugzilla.ui \
+org.eclipse.mylyn.commons.core \
+org.eclipse.mylyn.commons.net \
+org.eclipse.mylyn.commons.ui \
+org.eclipse.mylyn.compatibility \
org.eclipse.mylyn.context.core \
+org.eclipse.mylyn.context-feature \
org.eclipse.mylyn.context.tests \
org.eclipse.mylyn.context.ui \
-org.eclipse.mylyn.context-feature \
+org.eclipse.mylyn-feature \
org.eclipse.mylyn.help.ui \
org.eclipse.mylyn.ide.ant \
-org.eclipse.mylyn.ide.ui \
org.eclipse.mylyn.ide-feature \
org.eclipse.mylyn.ide.tests \
-org.eclipse.mylyn.java.ui \
-org.eclipse.mylyn.java.tests \
+org.eclipse.mylyn.ide.ui \
org.eclipse.mylyn.java-feature \
+org.eclipse.mylyn.java.tasks \
+org.eclipse.mylyn.java.tests \
+org.eclipse.mylyn.java.ui \
org.eclipse.mylyn.monitor.core \
-org.eclipse.mylyn.monitor.ui \
-org.eclipse.mylyn.monitor.tests \
org.eclipse.mylyn.monitor-feature \
+org.eclipse.mylyn.monitor.tests \
+org.eclipse.mylyn.monitor.ui \
org.eclipse.mylyn.monitor.usage \
-org.eclipse.mylyn.pde.ui \
org.eclipse.mylyn.pde-feature \
-org.eclipse.mylyn.resources.ui \
+org.eclipse.mylyn.pde.ui \
org.eclipse.mylyn.resources.tests \
+org.eclipse.mylyn.resources.ui \
+org.eclipse.mylyn.tasks.bugs \
org.eclipse.mylyn.tasks.core \
org.eclipse.mylyn.tasks.tests \
org.eclipse.mylyn.tasks.ui \
org.eclipse.mylyn.team.cvs \
-org.eclipse.mylyn.team.ui \
+org.eclipse.mylyn.team-feature \
org.eclipse.mylyn.team.tests \
+org.eclipse.mylyn.team.ui \
org.eclipse.mylyn.tests \
-org.eclipse.mylyn.trac-feature \
org.eclipse.mylyn.trac.core \
-org.eclipse.mylyn.trac.ui \
+org.eclipse.mylyn.trac-feature \
org.eclipse.mylyn.trac.tests \
-org.eclipse.mylyn.web.core \
+org.eclipse.mylyn.trac.ui \
org.eclipse.mylyn.web.tasks \
org.eclipse.mylyn.web.ui \
; do
cvs -d :pserver:anonymous@dev.eclipse.org:/cvsroot/tools \
-export -r R_2_3_2_e_3_3 org.eclipse.mylyn/$f;
+export -r R_3_0_1 org.eclipse.mylyn/$f;
done
diff --git a/sources b/sources
index b30954b..788b95c 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
9bb866cc22d0cdca66074b2aaafb4825 fedoraeclipse-mylynbugzilla-0.0.2.zip
-238f978fac59890062a151748cc7fe00 org.eclipse.mylyn-R_2_3_2_e_3_3-fetched-src.tar.bz2
+48e2c7b8a07d821c178d1303b3ff4d33 org.eclipse.mylyn-R_3_0_1-fetched-src.tar.bz2