rpms/eclipse-mylyn/devel eclipse-mylyn-pdeui-idocumentattributerename.patch, NONE, 1.1 eclipse-mylyn-webcorejar.patch, 1.1, 1.2 fetch-mylyn.sh, 1.1, 1.2 eclipse-mylyn.spec, 1.11, 1.12 eclipse-mylyn-unpackwebcore.patch, 1.1, 1.2 eclipse-mylyn-addfedoracustomizations.patch, 1.1, 1.2 eclipse-mylar-createSocketworkaround.patch, 1.1, NONE
Andrew Overholt (overholt)
fedora-extras-commits at redhat.com
Wed Oct 24 22:09:42 UTC 2007
Author: overholt
Update of /cvs/pkgs/rpms/eclipse-mylyn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28321/devel
Modified Files:
eclipse-mylyn-webcorejar.patch fetch-mylyn.sh
eclipse-mylyn.spec eclipse-mylyn-unpackwebcore.patch
eclipse-mylyn-addfedoracustomizations.patch
Added Files:
eclipse-mylyn-pdeui-idocumentattributerename.patch
Removed Files:
eclipse-mylar-createSocketworkaround.patch
Log Message:
* Wed Oct 24 2007 Andrew Overholt <overholt at redhat.com> 2.1.0-1
- 2.1.0
- Enable GNOME bugzilla by default
eclipse-mylyn-pdeui-idocumentattributerename.patch:
--- NEW FILE eclipse-mylyn-pdeui-idocumentattributerename.patch ---
### Eclipse Workspace Patch 1.0
#P org.eclipse.mylyn.pde.ui
Index: src/org/eclipse/mylyn/internal/pde/ui/PdeEditingMonitor.java
===================================================================
RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.pde.ui/src/org/eclipse/mylyn/internal/pde/ui/PdeEditingMonitor.java,v
retrieving revision 1.7
diff -u -r1.7 PdeEditingMonitor.java
--- src/org/eclipse/mylyn/internal/pde/ui/PdeEditingMonitor.java 21 Sep 2007 18:44:02 -0000 1.7
+++ src/org/eclipse/mylyn/internal/pde/ui/PdeEditingMonitor.java 24 Oct 2007 21:39:57 -0000
@@ -24,8 +24,8 @@
import org.eclipse.pde.core.plugin.IPluginModelBase;
import org.eclipse.pde.core.plugin.IPluginObject;
import org.eclipse.pde.internal.core.plugin.ImportObject;
-import org.eclipse.pde.internal.core.text.IDocumentAttributeNode;
-import org.eclipse.pde.internal.core.text.IDocumentElementNode;
+import org.eclipse.pde.internal.core.text.IDocumentAttribute;
+import org.eclipse.pde.internal.core.text.IDocumentNode;
import org.eclipse.pde.internal.core.text.plugin.PluginModel;
import org.eclipse.pde.internal.core.text.plugin.PluginObjectNode;
import org.eclipse.pde.internal.ui.editor.plugin.ManifestEditor;
@@ -123,11 +123,11 @@
}
}
- public static String getStringOfNode(IDocumentElementNode node) {
+ public static String getStringOfNode(IDocumentNode node) {
if (node == null)
return null;
String s = node.getXMLTagName();
- for (IDocumentAttributeNode a : node.getNodeAttributes()) {
+ for (IDocumentAttribute a : node.getNodeAttributes()) {
s += a.getAttributeName() + "=" + a.getAttributeValue();
}
return s;
@@ -187,14 +187,14 @@
/**
* COPIED FROM ManifestSourcePage
*/
- private static IDocumentElementNode findNode(IPluginObject[] nodes, int offset, boolean hashCode) {
+ private static IDocumentNode findNode(IPluginObject[] nodes, int offset, boolean hashCode) {
for (int i = 0; i < nodes.length; i++) {
- IDocumentElementNode node = (IDocumentElementNode) nodes[i];
- IDocumentElementNode[] children = node.getChildNodes();
+ IDocumentNode node = (IDocumentNode) nodes[i];
+ IDocumentNode[] children = node.getChildNodes();
// changed region - added to check the children to make it work
// properly
- IDocumentElementNode node2 = null;
+ IDocumentNode node2 = null;
if (children.length > 0)
node2 = PdeEditingMonitor.findNode(children, offset, hashCode);
// end changed region
@@ -217,11 +217,11 @@
/**
* Copy of previous, taking different arguments
*/
- private static IDocumentElementNode findNode(IDocumentElementNode[] nodes, int offset, boolean hashCode) {
+ private static IDocumentNode findNode(IDocumentNode[] nodes, int offset, boolean hashCode) {
for (int i = 0; i < nodes.length; i++) {
- IDocumentElementNode node = nodes[i];
- IDocumentElementNode[] children = node.getChildNodes();
- IDocumentElementNode node2 = null;
+ IDocumentNode node = nodes[i];
+ IDocumentNode[] children = node.getChildNodes();
+ IDocumentNode node2 = null;
if (children.length > 0)
node2 = PdeEditingMonitor.findNode(children, offset, hashCode);
if (node2 != null)
eclipse-mylyn-webcorejar.patch:
Index: eclipse-mylyn-webcorejar.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-mylyn/devel/eclipse-mylyn-webcorejar.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eclipse-mylyn-webcorejar.patch 13 Sep 2007 17:41:47 -0000 1.1
+++ eclipse-mylyn-webcorejar.patch 24 Oct 2007 22:09:37 -0000 1.2
@@ -3,22 +3,14 @@
Index: .classpath
===================================================================
RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.web.core/.classpath,v
-retrieving revision 1.2
-diff -u -r1.2 .classpath
---- .classpath 9 Jun 2007 02:10:30 -0000 1.2
-+++ .classpath 7 Sep 2007 16:07:52 -0000
-@@ -1,6 +1,7 @@
- <?xml version="1.0" encoding="UTF-8"?>
- <classpath>
- <classpathentry kind="src" path="src"/>
-+ <classpathentry exported="true" kind="lib" path="mylyn-webcore.jar"/>
- <classpathentry exported="true" kind="lib" path="lib-httpclient/commons-httpclient-3.0.1.jar"/>
- <classpathentry exported="true" kind="lib" path="lib-httpclient/commons-codec-1.3.jar"/>
- <classpathentry exported="true" kind="lib" path="lib-httpclient/commons-logging-1.0.4.jar"/>
-@@ -8,7 +9,6 @@
- <classpathentry exported="true" kind="lib" path="lib-xmlrpc/xmlrpc-client-3.0.jar"/>
- <classpathentry exported="true" kind="lib" path="lib-xmlrpc/xmlrpc-common-3.0.jar"/>
- <classpathentry exported="true" kind="lib" path="lib-xmlrpc/ws-commons-util-1.0.1.jar"/>
+retrieving revision 1.4
+diff -u -r1.4 .classpath
+--- .classpath 20 Sep 2007 04:30:29 -0000 1.4
++++ .classpath 24 Oct 2007 21:50:26 -0000
+@@ -8,7 +8,6 @@
+ <classpathentry exported="true" kind="lib" path="lib-xmlrpc/xmlrpc-client-3.0.jar" sourcepath="lib-xmlrpc/xmlrpc-client-3.0-sources.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib-xmlrpc/xmlrpc-common-3.0.jar" sourcepath="lib-xmlrpc/xmlrpc-common-3.0-sources.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib-xmlrpc/ws-commons-util-1.0.1.jar" sourcepath="lib-xmlrpc/ws-commons-util-1.0.1-sources.jar"/>
- <classpathentry exported="true" kind="lib" path="lib-rome/rome-0.8.jar"/>
<classpathentry exported="true" kind="lib" path="lib-rome/jdom-1.0.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
@@ -26,32 +18,29 @@
Index: build.properties
===================================================================
RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.web.core/build.properties,v
-retrieving revision 1.3
-diff -u -r1.3 build.properties
---- build.properties 26 Jun 2007 01:16:25 -0000 1.3
-+++ build.properties 7 Sep 2007 16:07:52 -0000
-@@ -5,10 +5,10 @@
+retrieving revision 1.4
+diff -u -r1.4 build.properties
+--- build.properties 5 Jul 2007 04:31:25 -0000 1.4
++++ build.properties 24 Oct 2007 21:50:26 -0000
+@@ -5,8 +5,8 @@
# 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/
++output.mylyn-webcore.jar = src/
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.18
-diff -u -r1.18 MANIFEST.MF
---- META-INF/MANIFEST.MF 28 Jun 2007 18:19:07 -0000 1.18
-+++ META-INF/MANIFEST.MF 7 Sep 2007 16:07:53 -0000
-@@ -8,7 +8,7 @@
+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 24 Oct 2007 21:50:26 -0000
+@@ -8,29 +8,15 @@
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.core.net
@@ -60,12 +49,13 @@
lib-httpclient/commons-httpclient-3.0.1.jar,
lib-httpclient/commons-codec-1.3.jar,
lib-httpclient/commons-logging-1.0.4.jar,
-@@ -16,21 +16,8 @@
+ lib-httpclient/commons-logging-api-1.0.4.jar,
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-rome/jdom-1.0.jar
++ lib-xmlrpc/ws-commons-util-1.0.1.jar
Export-Package: .,
- com.sun.syndication,
- com.sun.syndication.feed,
@@ -82,4 +72,3 @@
org.apache.commons.codec,
org.apache.commons.codec.binary,
org.apache.commons.codec.digest,
-
Index: fetch-mylyn.sh
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-mylyn/devel/fetch-mylyn.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fetch-mylyn.sh 2 Oct 2007 18:58:46 -0000 1.1
+++ fetch-mylyn.sh 24 Oct 2007 22:09:37 -0000 1.2
@@ -3,7 +3,6 @@
for f in \
org.eclipse.mylyn \
org.eclipse.mylyn-feature \
-org.eclipse.mylyn-site \
org.eclipse.mylyn.compatibility \
org.eclipse.mylyn.bugzilla-feature \
org.eclipse.mylyn.bugzilla.core \
@@ -51,5 +50,5 @@
org.eclipse.mylyn.web.ui \
; do
cvs -d :pserver:anonymous at dev.eclipse.org:/cvsroot/tools \
-export -r R_2_0_0 org.eclipse.mylyn/$f;
+export -r R_2_1_0 org.eclipse.mylyn/$f;
done
Index: eclipse-mylyn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-mylyn/devel/eclipse-mylyn.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- eclipse-mylyn.spec 2 Oct 2007 18:58:46 -0000 1.11
+++ eclipse-mylyn.spec 24 Oct 2007 22:09:37 -0000 1.12
@@ -3,8 +3,8 @@
Name: eclipse-mylyn
Summary: Mylyn is a task-focused UI for Eclipse
-Version: 2.0.0
-Release: 10%{?dist}
+Version: 2.1.0
+Release: 1%{?dist}
License: Eclipse Public License
URL: http://www.eclipse.org/mylyn
@@ -14,18 +14,16 @@
# mkdir temp && cd temp
# sh fetch-mylyn.sh
-# tar cjf org.eclipse.mylyn-R_2_0_0-fetched-src.tar.bz2 org.eclipse.mylyn
-Source0: org.eclipse.mylyn-R_2_0_0-fetched-src.tar.bz2
+# 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
Source1: fetch-mylyn.sh
-Source2: http://overholt.fedorapeople.org/fedoraeclipse-mylynbugzilla-0.0.1.zip
+Source2: http://overholt.fedorapeople.org/fedoraeclipse-mylynbugzilla-0.0.2.zip
-# SSLSocketFactory#createSocket() is not implemented in GNU Classpath
-# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=31626
-Patch3: eclipse-mylar-createSocketworkaround.patch
# So we can symlink to dependencies
Patch4: %{name}-unpackwebcore.patch
Patch5: %{name}-webcorejar.patch
Patch6: %{name}-addfedoracustomizations.patch
+Patch7: %{name}-pdeui-idocumentationattributerename.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -126,17 +124,21 @@
%setup -q -n org.eclipse.mylyn
unzip -q %{SOURCE2}
-# GCJ issue
+# 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
-# GCJ issue
+# So we can symlink to jars from another package
pushd org.eclipse.mylyn.web.core
-%patch3 -p0
%patch5
popd
+# FIXME: talk to upstream about this (and tagging in general)
+pushd org.eclipse.mylyn.pde.ui
+%patch8
+popd
+
# So we can symlink to dependencies
%patch4
@@ -505,6 +507,10 @@
%endif
%changelog
+* Wed Oct 24 2007 Andrew Overholt <overholt at redhat.com> 2.1.0-1
+- 2.1.0
+- Enable GNOME bugzilla by default
+
* Tue Oct 02 2007 Andrew Overholt <overholt at redhat.com> 2.0.0-10
- Add %%post gcj blocks for sub-packages (thanks to David Walluck).
- Rename fetching script (s/mylar/mylyn/).
eclipse-mylyn-unpackwebcore.patch:
Index: eclipse-mylyn-unpackwebcore.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-mylyn/devel/eclipse-mylyn-unpackwebcore.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eclipse-mylyn-unpackwebcore.patch 13 Sep 2007 17:41:47 -0000 1.1
+++ eclipse-mylyn-unpackwebcore.patch 24 Oct 2007 22:09:37 -0000 1.2
@@ -1,12 +1,18 @@
-diff -ur org.eclipse.mylyn-feature/feature.xml org.eclipse.mylyn-feature/feature.xml
---- org.eclipse.mylyn-feature/feature.xml 2007-09-05 17:37:56.000000000 -0400
-+++ org.eclipse.mylyn-feature/feature.xml 2007-09-05 17:38:05.000000000 -0400
-@@ -299,7 +299,7 @@
+### 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.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 @@
download-size="0"
install-size="0"
- version="2.0.0.v20070627-1400"
+ version="2.1.0.v20070927-0900"
- unpack="false"/>
+ unpack="true"/>
-
- </feature>
+ <plugin
+ id="org.eclipse.mylyn.compatibility"
eclipse-mylyn-addfedoracustomizations.patch:
Index: eclipse-mylyn-addfedoracustomizations.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-mylyn/devel/eclipse-mylyn-addfedoracustomizations.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eclipse-mylyn-addfedoracustomizations.patch 19 Sep 2007 22:31:16 -0000 1.1
+++ eclipse-mylyn-addfedoracustomizations.patch 24 Oct 2007 22:09:37 -0000 1.2
@@ -3,12 +3,12 @@
Index: feature.xml
===================================================================
RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.bugzilla-feature/feature.xml,v
-retrieving revision 1.335
-diff -u -r1.335 feature.xml
---- feature.xml 28 Jun 2007 18:19:54 -0000 1.335
-+++ feature.xml 19 Sep 2007 19:05:41 -0000
+retrieving revision 1.365
+diff -u -r1.365 feature.xml
+--- feature.xml 27 Sep 2007 16:32:09 -0000 1.365
++++ feature.xml 24 Oct 2007 21:46:10 -0000
@@ -252,4 +252,11 @@
- version="2.0.0.v20070627-1400"
+ version="2.1.0.v20070927-0900"
unpack="false"/>
+ <plugin
--- eclipse-mylar-createSocketworkaround.patch DELETED ---
More information about the scm-commits
mailing list