From 9f48f9fd36e06b2ce5db0503e4efcb5046f5290e Mon Sep 17 00:00:00 2001 From: Andrew Overholt Date: Apr 04 2008 19:16:58 +0000 Subject: - 2.3.2. - Add jakarta-commons-lang dependency. --- diff --git a/eclipse-mylyn-unpackwebcore.patch b/eclipse-mylyn-unpackwebcore.patch index 3475581..f77ca1b 100644 --- a/eclipse-mylyn-unpackwebcore.patch +++ b/eclipse-mylyn-unpackwebcore.patch @@ -3,14 +3,14 @@ Index: feature.xml =================================================================== RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn-feature/feature.xml,v -retrieving revision 1.388 -diff -u -r1.388 feature.xml ---- feature.xml 27 Sep 2007 17:07:18 -0000 1.388 -+++ feature.xml 24 Oct 2007 21:47:12 -0000 -@@ -298,7 +298,7 @@ +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.1.0.v20070927-0900" + version="2.3.2.qualifier" - unpack="false"/> + unpack="true"/> diff --git a/eclipse-mylyn-webcorejar.patch b/eclipse-mylyn-webcorejar.patch index 56d3650..d2d821d 100644 --- a/eclipse-mylyn-webcorejar.patch +++ b/eclipse-mylyn-webcorejar.patch @@ -3,19 +3,19 @@ Index: .classpath =================================================================== RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.web.core/.classpath,v -retrieving revision 1.4 -diff -u -r1.4 .classpath ---- .classpath 20 Sep 2007 04:30:29 -0000 1.4 -+++ .classpath 25 Oct 2007 13:17:14 -0000 +retrieving revision 1.6 +diff -u -r1.6 .classpath +--- .classpath 3 Jan 2008 01:54:46 -0000 1.6 ++++ .classpath 4 Apr 2008 15:31:44 -0000 @@ -1,6 +1,7 @@ + - + + - -@@ -8,7 +9,6 @@ +@@ -9,7 +10,6 @@ @@ -26,10 +26,10 @@ diff -u -r1.4 .classpath Index: build.properties =================================================================== RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.web.core/build.properties,v -retrieving revision 1.4 -diff -u -r1.4 build.properties ---- build.properties 5 Jul 2007 04:31:25 -0000 1.4 -+++ build.properties 25 Oct 2007 13:17:14 -0000 +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 @@ -47,26 +47,26 @@ diff -u -r1.4 build.properties 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.44 -diff -u -r1.44 MANIFEST.MF ---- META-INF/MANIFEST.MF 27 Sep 2007 17:00:26 -0000 1.44 -+++ META-INF/MANIFEST.MF 25 Oct 2007 13:17:14 -0000 -@@ -8,29 +8,15 @@ +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.0.1.jar, + lib-httpclient/commons-httpclient-3.1.jar, lib-httpclient/commons-codec-1.3.jar, lib-httpclient/commons-logging-1.0.4.jar, - lib-httpclient/commons-logging-api-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-xmlrpc/ws-commons-util-1.0.1.jar, - lib-rome/rome-0.8.jar, -- lib-rome/jdom-1.0.jar -+ lib-xmlrpc/ws-commons-util-1.0.1.jar + lib-rome/jdom-1.0.jar, + lib-lang/commons-lang-2.1.jar Export-Package: ., - com.sun.syndication, - com.sun.syndication.feed, diff --git a/eclipse-mylyn.spec b/eclipse-mylyn.spec index d5f3fc1..69598d2 100644 --- a/eclipse-mylyn.spec +++ b/eclipse-mylyn.spec @@ -3,8 +3,8 @@ Name: eclipse-mylyn Summary: Mylyn is a task-focused UI for Eclipse -Version: 2.1.0 -Release: 2%{?dist} +Version: 2.3.2 +Release: 1%{?dist} License: Eclipse Public License URL: http://www.eclipse.org/mylyn @@ -14,8 +14,8 @@ ExcludeArch: ppc64 # mkdir temp && cd temp # sh fetch-mylyn.sh -# tar cjf org.eclipse.mylyn-R_2_1_0-fetched-src.tar.bz2 org.eclipse.mylyn -Source0: org.eclipse.mylyn-R_2_1_0-fetched-src.tar.bz2 +# 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 Source1: fetch-mylyn.sh Source2: http://overholt.fedorapeople.org/fedoraeclipse-mylynbugzilla-0.0.2.zip @@ -23,7 +23,6 @@ Source2: http://overholt.fedorapeople.org/fedoraeclipse-mylynbugzilla-0.0.2.zip Patch4: %{name}-unpackwebcore.patch Patch5: %{name}-webcorejar.patch Patch6: %{name}-addfedoracustomizations.patch -Patch7: %{name}-pdeui-idocumentattributerename.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -40,19 +39,21 @@ BuildRequires: java-devel >= 1.5.0 BuildArch: noarch %endif -BuildRequires: eclipse-pde >= 3.2.1 -BuildRequires: eclipse-cvs-client >= 3.2.1 +BuildRequires: eclipse-pde >= 1:3.3.2 +BuildRequires: eclipse-cvs-client >= 1:3.3.2 BuildRequires: jakarta-commons-codec >= 1.3-8jpp.2 -BuildRequires: jakarta-commons-httpclient >= 1:3.0.1-1jpp.2 +BuildRequires: jakarta-commons-httpclient >= 1:3.1 BuildRequires: jakarta-commons-logging +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 >= 3.2.1 -Requires: eclipse-cvs-client >= 3.2.1 +Requires: eclipse-platform >= 1:3.3.0 +Requires: eclipse-cvs-client >= 1:3.3.0 Requires: jakarta-commons-codec >= 1.3-8jpp.2 -Requires: jakarta-commons-httpclient >= 1:3.0.1-1jpp.2 +Requires: jakarta-commons-httpclient >= 1:3.1 Requires: jakarta-commons-logging +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 @@ -134,24 +135,16 @@ pushd org.eclipse.mylyn.web.core %patch5 popd -# FIXME: talk to upstream about this (and tagging in general) -pushd org.eclipse.mylyn.pde.ui -%patch7 -popd - # So we can symlink to dependencies pushd org.eclipse.mylyn-feature %patch4 popd -/bin/sh -x %{eclipse_base}/buildscripts/copy-platform SDK %{eclipse_base} -mkdir home - # 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.0.1.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 @@ -166,141 +159,37 @@ 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-2.1.jar +popd pushd org.eclipse.mylyn.bugzilla-feature %patch6 popd -# remove references to mylar in feature -sed --in-place -e "304,456d" org.eclipse.mylyn-feature/feature.xml -sed --in-place "s///" org.eclipse.mylyn-feature/feature.xml -%{__grep} mylar org.eclipse.mylyn-feature/feature.xml && exit 1 - %build -SDK=$(cd SDK > /dev/null && pwd) - -# Eclipse may try to write to the home directory. -homedir=$(cd home > /dev/null && pwd) - -# build the main mylyn feature -java -cp $SDK/startup.jar \ - -Dosgi.sharedConfiguration.area=%{_libdir}/eclipse/configuration \ - org.eclipse.core.launcher.Main \ - -application org.eclipse.ant.core.antRunner \ - -DjavacSource=1.5 \ - -DjavacTarget=1.5 \ - -Dtype=feature \ - -Did=org.eclipse.mylyn_feature \ - -DbaseLocation=$SDK \ - -DsourceDirectory=$(pwd) \ - -DbuildDirectory=$(pwd)/build \ - -Dbuilder=%{eclipse_base}/plugins/org.eclipse.pde.build/templates/package-build \ - -f %{eclipse_base}/plugins/org.eclipse.pde.build/scripts/build.xml \ - -vmargs -Duser.home=$homedir \ - -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar - -# build the mylyn bugzilla feature -java -cp $SDK/startup.jar \ - -Dosgi.sharedConfiguration.area=%{_libdir}/eclipse/configuration \ - org.eclipse.core.launcher.Main \ - -application org.eclipse.ant.core.antRunner \ - -DjavacSource=1.5 \ - -DjavacTarget=1.5 \ - -Dtype=feature \ - -Did=org.eclipse.mylyn.bugzilla_feature \ - -DbaseLocation=$SDK \ - -DsourceDirectory=$(pwd) \ - -DbuildDirectory=$(pwd)/build \ - -Dbuilder=%{eclipse_base}/plugins/org.eclipse.pde.build/templates/package-build \ - -f %{eclipse_base}/plugins/org.eclipse.pde.build/scripts/build.xml \ - -vmargs -Duser.home=$homedir \ - -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar - -# build the mylyn context feature -java -cp $SDK/startup.jar \ - -Dosgi.sharedConfiguration.area=%{_libdir}/eclipse/configuration \ - org.eclipse.core.launcher.Main \ - -application org.eclipse.ant.core.antRunner \ - -DjavacSource=1.5 \ - -DjavacTarget=1.5 \ - -Dtype=feature \ - -Did=org.eclipse.mylyn.context_feature \ - -DbaseLocation=$SDK \ - -DsourceDirectory=$(pwd) \ - -DbuildDirectory=$(pwd)/build \ - -Dbuilder=%{eclipse_base}/plugins/org.eclipse.pde.build/templates/package-build \ - -f %{eclipse_base}/plugins/org.eclipse.pde.build/scripts/build.xml \ - -vmargs -Duser.home=$homedir \ - -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar - -# build the mylyn ide feature -java -cp $SDK/startup.jar \ - -Dosgi.sharedConfiguration.area=%{_libdir}/eclipse/configuration \ - org.eclipse.core.launcher.Main \ - -application org.eclipse.ant.core.antRunner \ - -DjavacSource=1.5 \ - -DjavacTarget=1.5 \ - -Dtype=feature \ - -Did=org.eclipse.mylyn.ide_feature \ - -DbaseLocation=$SDK \ - -DsourceDirectory=$(pwd) \ - -DbuildDirectory=$(pwd)/build \ - -Dbuilder=%{eclipse_base}/plugins/org.eclipse.pde.build/templates/package-build \ - -f %{eclipse_base}/plugins/org.eclipse.pde.build/scripts/build.xml \ - -vmargs -Duser.home=$homedir \ - -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar - -# build the mylyn trac feature -java -cp $SDK/startup.jar \ - -Dosgi.sharedConfiguration.area=%{_libdir}/eclipse/configuration \ - org.eclipse.core.launcher.Main \ - -application org.eclipse.ant.core.antRunner \ - -DjavacSource=1.5 \ - -DjavacTarget=1.5 \ - -Dtype=feature \ - -Did=org.eclipse.mylyn.trac_feature \ - -DbaseLocation=$SDK \ - -DsourceDirectory=$(pwd) \ - -DbuildDirectory=$(pwd)/build \ - -Dbuilder=%{eclipse_base}/plugins/org.eclipse.pde.build/templates/package-build \ - -f %{eclipse_base}/plugins/org.eclipse.pde.build/scripts/build.xml \ - -vmargs -Duser.home=$homedir \ - -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar - -# build the mylyn java feature -java -cp $SDK/startup.jar \ - -Dosgi.sharedConfiguration.area=%{_libdir}/eclipse/configuration \ - org.eclipse.core.launcher.Main \ - -application org.eclipse.ant.core.antRunner \ - -DjavacSource=1.5 \ - -DjavacTarget=1.5 \ - -Dtype=feature \ - -Did=org.eclipse.mylyn.java_feature \ - -DbaseLocation=$SDK \ - -DsourceDirectory=$(pwd) \ - -DbuildDirectory=$(pwd)/build \ - -Dbuilder=%{eclipse_base}/plugins/org.eclipse.pde.build/templates/package-build \ - -f %{eclipse_base}/plugins/org.eclipse.pde.build/scripts/build.xml \ - -vmargs -Duser.home=$homedir \ - -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar - -# build the mylyn pde feature -java -cp $SDK/startup.jar \ - -Dosgi.sharedConfiguration.area=%{_libdir}/eclipse/configuration \ - org.eclipse.core.launcher.Main \ - -application org.eclipse.ant.core.antRunner \ - -DjavacSource=1.5 \ - -DjavacTarget=1.5 \ - -Dtype=feature \ - -Did=org.eclipse.mylyn.pde_feature \ - -DbaseLocation=$SDK \ - -DsourceDirectory=$(pwd) \ - -DbuildDirectory=$(pwd)/build \ - -Dbuilder=%{eclipse_base}/plugins/org.eclipse.pde.build/templates/package-build \ - -f %{eclipse_base}/plugins/org.eclipse.pde.build/scripts/build.xml \ - -vmargs -Duser.home=$homedir \ - -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar - +%{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 +%{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 +%{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 +%{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 +%{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 +%{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 %install rm -rf %{buildroot} @@ -324,7 +213,7 @@ unzip -q -d $RPM_BUILD_ROOT%{eclipse_base}/.. \ 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.0.1.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 @@ -339,6 +228,10 @@ pushd $RPM_BUILD_ROOT%{eclipse_base}/plugins/org.eclipse.mylyn.web.core_*/lib-ro rm *.jar 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-2.1.jar +popd %if %{gcj_support} %{_bindir}/aot-compile-rpm @@ -479,6 +372,7 @@ fi %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 @@ -497,6 +391,7 @@ fi %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_* @@ -509,6 +404,10 @@ fi %endif %changelog +* Fri Apr 04 2008 Andrew Overholt 2.3.2-1 +- 2.3.2. +- Add jakarta-commons-lang dependency. + * Tue Feb 19 2008 Fedora Release Engineering - 2.1.0-2 - Autorebuild for GCC 4.3 diff --git a/fetch-mylyn.sh b/fetch-mylyn.sh index 04c3738..99ec1f2 100644 --- a/fetch-mylyn.sh +++ b/fetch-mylyn.sh @@ -46,5 +46,5 @@ org.eclipse.mylyn.web.tasks \ org.eclipse.mylyn.web.ui \ ; do cvs -d :pserver:anonymous@dev.eclipse.org:/cvsroot/tools \ -export -r R_2_1_0 org.eclipse.mylyn/$f; +export -r R_2_3_2_e_3_3 org.eclipse.mylyn/$f; done