From 2084c12bd700018ce9b9f1f80f19e11160d340c8 Mon Sep 17 00:00:00 2001 From: Andrew Overholt Date: Aug 01 2008 18:02:08 +0000 Subject: - Fold -ide and -bugzilla into main package - Add commented-out webtasks sub-package; to be enabled after rome review is complete --- diff --git a/eclipse-mylyn.spec b/eclipse-mylyn.spec index eef530a..a3dffa5 100644 --- a/eclipse-mylyn.spec +++ b/eclipse-mylyn.spec @@ -1,4 +1,5 @@ %define eclipse_base %{_libdir}/eclipse +%define install_loc %{_datadir}/eclipse # Taken from update site so we match upstream # http://download.eclipse.org/tools/mylyn/update/e3.4/ %define qualifier v20080716-2300-e3x @@ -40,8 +41,8 @@ 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 -BuildRequires: rome -BuildRequires: jdom +#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 @@ -51,42 +52,25 @@ 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 - -Group: Development/Tools - -%description -Mylyn integrates task support into Eclipse. It supports offline editing -for certain task repositories and monitors work activity to hide -information that is not relevant to the current task. - -%package bugzilla -Summary: Mylyn Bugzilla Connector -Requires: %{name} = %{version}-%{release} -Group: Development/Tools +Provides: eclipse-mylyn-ide = %{version}-%{release} +Obsoletes: eclipse-mylyn-ide < 3.0.0 Provides: eclipse-bugzilla = 1:0.2.4-4.fc6 Obsoletes: eclipse-bugzilla < 1:0.2.5 Provides: eclipse-mylar-bugzilla = 2.0.0-1.fc7 Obsoletes: eclipse-mylar-bugzilla < 2.0.0 +Provides: eclipse-mylyn-bugzilla = %{version}-%{release} +Obsoletes: eclipse-mylyn-bugzilla < 3.0.0 -%description bugzilla -Bugzilla client integrated with Eclipse and Mylyn; can be used -standalone. - -%package ide -Summary: Mylyn Focused UI -Requires: %{name} = %{version}-%{release} Group: Development/Tools -Provides: eclipse-mylar-ide = 2.0.0-1.fc7 -Obsoletes: eclipse-mylar-ide < 2.0.0 -%description ide -Mylyn Focused UI for reducing information overload when working with -tasks. Filters and decorates views and editors to focus on the task -context. +%description +Mylyn integrates task support into Eclipse. It supports offline editing +for certain task repositories and monitors work activity to hide +information that is not relevant to the current task. Also included is +the Mylyn Focused UI for reducing information overload when working with +tasks and the Bugzilla task connector. %package trac Summary: Mylyn Trac Connector @@ -117,6 +101,17 @@ Group: Development/Tools %description pde Mylyn Task-Focused UI extensions for PDE, Ant, Team Support and CVS. +#%package webtasks +#Summary: Mylyn Focused UI +#Requires: %{name} = %{version}-%{release} +#Requires: rome +#Requires: jdom +#Group: Development/Tools +# +#%description webtasks +#Provides Task List integration for several web-based issue trackers +#and templates for example projects. + %prep %setup -q -n org.eclipse.mylyn unzip -q %{SOURCE2} @@ -134,8 +129,8 @@ 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 +#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 #javax.activation_1.1.0.v200806101325.jar @@ -191,55 +186,156 @@ popd %install rm -rf %{buildroot} -install -d -m 755 $RPM_BUILD_ROOT%{eclipse_base}/dropins +install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/eclipse -unzip -q -d $RPM_BUILD_ROOT%{eclipse_base}/dropins/mylyn \ +unzip -q -o -d $RPM_BUILD_ROOT%{_datadir}/eclipse/.. \ build/rpmBuild/org.eclipse.mylyn_feature.zip -unzip -q -d $RPM_BUILD_ROOT%{eclipse_base}/dropins/mylyn-bugzilla \ +unzip -q -o -d $RPM_BUILD_ROOT%{_datadir}/eclipse/.. \ build/rpmBuild/org.eclipse.mylyn.bugzilla_feature.zip -unzip -q -d $RPM_BUILD_ROOT%{eclipse_base}/dropins/mylyn-context \ +unzip -q -o -d $RPM_BUILD_ROOT%{_datadir}/eclipse/.. \ build/rpmBuild/org.eclipse.mylyn.context_feature.zip -unzip -q -d $RPM_BUILD_ROOT%{eclipse_base}/dropins/mylyn-ide \ +unzip -q -o -d $RPM_BUILD_ROOT%{_datadir}/eclipse/.. \ + build/rpmBuild/org.eclipse.mylyn.team_feature.zip +unzip -q -o -d $RPM_BUILD_ROOT%{_datadir}/eclipse/.. \ build/rpmBuild/org.eclipse.mylyn.ide_feature.zip -unzip -q -d $RPM_BUILD_ROOT%{eclipse_base}/dropins/mylyn-trac \ +unzip -q -o -d $RPM_BUILD_ROOT%{_datadir}/eclipse/.. \ build/rpmBuild/org.eclipse.mylyn.trac_feature.zip -unzip -q -d $RPM_BUILD_ROOT%{eclipse_base}/dropins/mylyn-java \ +unzip -q -o -d $RPM_BUILD_ROOT%{_datadir}/eclipse/.. \ build/rpmBuild/org.eclipse.mylyn.java_feature.zip -unzip -q -d $RPM_BUILD_ROOT%{eclipse_base}/dropins/mylyn-pde \ +unzip -q -o -d $RPM_BUILD_ROOT%{_datadir}/eclipse/.. \ build/rpmBuild/org.eclipse.mylyn.pde_feature.zip +#unzip -q -o -d $RPM_BUILD_ROOT%{_datadir}/eclipse/.. \ +# build/rpmBuild/org.eclipse.mylyn.web.tasks_feature.zip + +pushd $RPM_BUILD_ROOT%{_datadir}/eclipse/plugins +rm org.apache.commons.codec_1.3.0.v20080530-1600.jar +rm org.apache.commons.httpclient_3.1.0.v20080605-1935.jar +rm org.apache.commons.lang_2.3.0.v200803061910.jar +rm org.apache.commons.logging_1.0.4.v20080605-1930.jar +rm org.apache.ws.commons.util_1.0.0.v20080716-2300-e3x.jar +rm org.apache.xmlrpc_3.0.0.v20080716-2300-e3x.jar +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 +popd %clean rm -rf %{buildroot} -%files bugzilla -%defattr(-,root,root,-) -%{eclipse_base}/dropins/mylyn-bugzilla - -%files ide -%defattr(-,root,root,-) -%{eclipse_base}/dropins/mylyn-ide +#%files webtasks +#%defattr(-,root,root,-) +#%{install_loc}/plugins/com.sun.syndication_*.jar +#%{install_loc}/plugins/org.jdom_*.jar +#%{install_loc}/plugins/org.eclipse.mylyn.web.tasks_*.jar +#%dir %{install_loc}/features/org.eclipse.mylyn.web.tasks_feature_* +#%doc %{install_loc}/features/org.eclipse.mylyn.web.tasks_feature_*/license.html +#%doc %{install_loc}/features/org.eclipse.mylyn.web.tasks_feature_*/about.html +#%doc %{install_loc}/features/org.eclipse.mylyn.web.tasks_feature_*/epl-v10.html +#%{install_loc}/features/org.eclipse.mylyn.web.tasks_feature_*/feature.xml %files trac %defattr(-,root,root,-) -%{eclipse_base}/dropins/mylyn-trac +%{install_loc}/plugins/org.eclipse.mylyn.trac.core_*.jar +%{install_loc}/plugins/org.eclipse.mylyn.trac.ui_*.jar +%dir %{install_loc}/features/org.eclipse.mylyn.trac_feature_* +%doc %{install_loc}/features/org.eclipse.mylyn.trac_feature_*/license.html +%doc %{install_loc}/features/org.eclipse.mylyn.trac_feature_*/epl-v10.html +%doc %{install_loc}/features/org.eclipse.mylyn.trac_feature_*/about.html +%{install_loc}/features/org.eclipse.mylyn.trac_feature_*/feature.xml +%{install_loc}/plugins/org.apache.xmlrpc.client_*.jar +%{install_loc}/plugins/org.apache.xmlrpc.common_*.jar +%{install_loc}/plugins/org.apache.ws.commons.util_*.jar %files java %defattr(-,root,root,-) -%{eclipse_base}/dropins/mylyn-java +%{install_loc}/plugins/org.eclipse.mylyn.java.ui_*.jar +%{install_loc}/plugins/org.eclipse.mylyn.java.tasks_*.jar +%{install_loc}/plugins/org.eclipse.mylyn.ide.ui_*.jar +%{install_loc}/plugins/org.eclipse.mylyn.ide.ant_*.jar +%dir %{install_loc}/features/org.eclipse.mylyn.java_feature_* +%doc %{install_loc}/features/org.eclipse.mylyn.java_feature_*/license.html +%doc %{install_loc}/features/org.eclipse.mylyn.java_feature_*/epl-v10.html +%doc %{install_loc}/features/org.eclipse.mylyn.java_feature_*/about.html +%{install_loc}/features/org.eclipse.mylyn.java_feature_*/feature.xml %files pde %defattr(-,root,root,-) -%{eclipse_base}/dropins/mylyn-pde +%{install_loc}/plugins/org.eclipse.mylyn.team.ui_*.jar +%{install_loc}/plugins/org.eclipse.mylyn.team.cvs_*.jar +%{install_loc}/plugins/org.eclipse.mylyn.bugzilla.ide_*.jar +%{install_loc}/plugins/org.eclipse.mylyn.pde.ui_*.jar +%dir %{install_loc}/features/org.eclipse.mylyn.pde_feature_* +%doc %{install_loc}/features/org.eclipse.mylyn.pde_feature_*/license.html +%doc %{install_loc}/features/org.eclipse.mylyn.pde_feature_*/epl-v10.html +%doc %{install_loc}/features/org.eclipse.mylyn.pde_feature_*/about.html +%{install_loc}/features/org.eclipse.mylyn.pde_feature_*/feature.xml %files %defattr(-,root,root,-) -%{eclipse_base}/dropins/mylyn -%{eclipse_base}/dropins/mylyn-context +%{install_loc}/plugins/org.eclipse.mylyn.compatibility_*.jar +%{install_loc}/plugins/org.eclipse.mylyn.context.core_*.jar +%{install_loc}/plugins/org.eclipse.mylyn.tasks.ui_*.jar +%{install_loc}/plugins/org.eclipse.mylyn.tasks.core_*.jar +%{install_loc}/plugins/org.eclipse.mylyn_*.jar +%{install_loc}/plugins/org.eclipse.mylyn.monitor.core_*.jar +%{install_loc}/plugins/org.eclipse.mylyn.monitor.ui_*.jar +%{install_loc}/plugins/org.eclipse.mylyn.commons.core_*.jar +%{install_loc}/plugins/org.eclipse.mylyn.commons.ui_*.jar +%{install_loc}/plugins/org.eclipse.mylyn.commons.net_*.jar +%{install_loc}/plugins/org.apache.commons.logging.api_*.jar +%{install_loc}/plugins/org.apache.commons.logging_*.jar +%{install_loc}/plugins/org.apache.commons.codec_*.jar +%{install_loc}/plugins/org.apache.commons.httpclient_*.jar +%{install_loc}/plugins/org.apache.commons.lang_*.jar +%dir %{install_loc}/features/org.eclipse.mylyn_feature_* +%doc %{install_loc}/features/org.eclipse.mylyn_feature_*/license.html +%doc %{install_loc}/features/org.eclipse.mylyn_feature_*/epl-v10.html +%doc %{install_loc}/features/org.eclipse.mylyn_feature_*/about.html +%{install_loc}/features/org.eclipse.mylyn_feature_*/feature.xml +%dir %{install_loc}/features/org.eclipse.mylyn.context_feature_* +%doc %{install_loc}/features/org.eclipse.mylyn.context_feature_*/license.html +%doc %{install_loc}/features/org.eclipse.mylyn.context_feature_*/epl-v10.html +%doc %{install_loc}/features/org.eclipse.mylyn.context_feature_*/about.html +%{install_loc}/features/org.eclipse.mylyn.context_feature_*/feature.xml +%{install_loc}/plugins/org.eclipse.mylyn.context.ui_*.jar +%{install_loc}/plugins/org.eclipse.mylyn.resources.ui_*.jar +%dir %{install_loc}/features/org.eclipse.mylyn.team_feature_* +%doc %{install_loc}/features/org.eclipse.mylyn.team_feature_*/license.html +%doc %{install_loc}/features/org.eclipse.mylyn.team_feature_*/epl-v10.html +%doc %{install_loc}/features/org.eclipse.mylyn.team_feature_*/about.html +%{install_loc}/features/org.eclipse.mylyn.team_feature_*/feature.xml +%{install_loc}/plugins/org.eclipse.mylyn.team.ui_*.jar +%{install_loc}/plugins/org.eclipse.mylyn.ide.ui_*.jar +%{install_loc}/plugins/org.eclipse.mylyn.team.cvs_*.jar +%{install_loc}/plugins/org.eclipse.mylyn.bugzilla.ide_*.jar +%{install_loc}/plugins/org.eclipse.mylyn.tasks.bugs_*.jar +%{install_loc}/plugins/org.eclipse.mylyn.help.ui_*.jar +%dir %{install_loc}/features/org.eclipse.mylyn.ide_feature_* +%doc %{install_loc}/features/org.eclipse.mylyn.ide_feature_*/license.html +%doc %{install_loc}/features/org.eclipse.mylyn.ide_feature_*/epl-v10.html +%doc %{install_loc}/features/org.eclipse.mylyn.ide_feature_*/about.html +%{install_loc}/features/org.eclipse.mylyn.ide_feature_*/feature.xml +%{install_loc}/plugins/org.eclipse.mylyn.bugzilla.core_*.jar +%{install_loc}/plugins/org.eclipse.mylyn.bugzilla.ui_*.jar +%{install_loc}/plugins/org.fedoraproject.mylyn.bugzilla_*.jar +%dir %{install_loc}/features/org.eclipse.mylyn.bugzilla_feature_* +%doc %{install_loc}/features/org.eclipse.mylyn.bugzilla_feature_*/license.html +%doc %{install_loc}/features/org.eclipse.mylyn.bugzilla_feature_*/about.html +%doc %{install_loc}/features/org.eclipse.mylyn.bugzilla_feature_*/epl-v10.html +%{install_loc}/features/org.eclipse.mylyn.bugzilla_feature_*/feature.xml %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) +- Fold -ide and -bugzilla into main package +- Add commented-out webtasks sub-package; to be enabled after rome + review is complete * Thu Jul 17 2008 Tom "spot" Callaway 2.3.2-6 - fix license tag diff --git a/fetch-mylyn.sh b/fetch-mylyn.sh index 21281b2..46565a6 100644 --- a/fetch-mylyn.sh +++ b/fetch-mylyn.sh @@ -47,8 +47,6 @@ org.eclipse.mylyn.trac.core \ org.eclipse.mylyn.trac-feature \ org.eclipse.mylyn.trac.tests \ 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_3_0_1 org.eclipse.mylyn/$f; diff --git a/sources b/sources index 788b95c..2e32be5 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ 9bb866cc22d0cdca66074b2aaafb4825 fedoraeclipse-mylynbugzilla-0.0.2.zip -48e2c7b8a07d821c178d1303b3ff4d33 org.eclipse.mylyn-R_3_0_1-fetched-src.tar.bz2 +29c421a77654a7095d38f1a0a9a41f3c org.eclipse.mylyn-R_3_0_1-fetched-src.tar.bz2