rpms/eclipse-mylar/devel .cvsignore, 1.2, 1.3 eclipse-mylar-createSocketworkaround.patch, 1.1, 1.2 eclipse-mylar.spec, 1.7, 1.8 fetch-mylar.sh, 1.1, 1.2 sources, 1.2, 1.3
Andrew Overholt (overholt)
fedora-extras-commits at redhat.com
Tue May 1 22:10:32 UTC 2007
- Previous message (by thread): rpms/perl-Affix-Infix2Postfix/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
- Next message (by thread): rpms/eclipse-mylar/devel eclipse-mylar-team1.5.patch, 1.1, NONE eclipse-mylar-web1.5.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: overholt
Update of /cvs/extras/rpms/eclipse-mylar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7995
Modified Files:
.cvsignore eclipse-mylar-createSocketworkaround.patch
eclipse-mylar.spec fetch-mylar.sh sources
Log Message:
* Wed Apr 25 2007 Andrew Overholt <overholt at redhat.com> 2.0-0.1.M2a.1
- 2.0M2a (a re-tag to fix some tagging issues).
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eclipse-mylar/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 20 Mar 2007 15:32:18 -0000 1.2
+++ .cvsignore 1 May 2007 22:09:57 -0000 1.3
@@ -1 +1 @@
-org.eclipse.mylar-R_1_0_0-fetched-src.tar.bz2
+org.eclipse.mylar-R_2_0_M2a_e_3_2-fetched-src.tar.bz2
eclipse-mylar-createSocketworkaround.patch:
Index: eclipse-mylar-createSocketworkaround.patch
===================================================================
RCS file: /cvs/extras/rpms/eclipse-mylar/devel/eclipse-mylar-createSocketworkaround.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eclipse-mylar-createSocketworkaround.patch 18 Apr 2007 17:39:47 -0000 1.1
+++ eclipse-mylar-createSocketworkaround.patch 1 May 2007 22:09:57 -0000 1.2
@@ -1,25 +1,24 @@
### Eclipse Workspace Patch 1.0
-#P org.eclipse.mylar.tasks.core
-Index: src/org/eclipse/mylar/internal/tasks/core/SslProtocolSocketFactory.java
+#P org.eclipse.mylar
+Index: src/org/eclipse/mylar/core/net/SslProtocolSocketFactory.java
===================================================================
-RCS file: /cvsroot/technology/org.eclipse.mylar/org.eclipse.mylar.tasks.core/src/org/eclipse/mylar/internal/tasks/core/Attic/SslProtocolSocketFactory.java,v
-retrieving revision 1.3
-diff -u -r1.3 SslProtocolSocketFactory.java
---- src/org/eclipse/mylar/internal/tasks/core/SslProtocolSocketFactory.java 7 Dec 2006 04:38:20 -0000 1.3
-+++ src/org/eclipse/mylar/internal/tasks/core/SslProtocolSocketFactory.java 18 Apr 2007 15:58:11 -0000
-@@ -97,10 +97,10 @@
- }
-
+RCS file: /cvsroot/technology/org.eclipse.mylar/org.eclipse.mylar/src/org/eclipse/mylar/core/net/SslProtocolSocketFactory.java,v
+retrieving revision 1.5
+diff -u -r1.5 SslProtocolSocketFactory.java
+--- src/org/eclipse/mylar/core/net/SslProtocolSocketFactory.java 19 Mar 2007 18:22:57 -0000 1.5
++++ src/org/eclipse/mylar/core/net/SslProtocolSocketFactory.java 24 Apr 2007 18:43:23 -0000
+@@ -104,9 +104,10 @@
+ if (timeout == 0) {
+ return getSocketFactory().createSocket(remoteHost, remotePort, clientHost, clientPort);
+ } else {
+- Socket socket = getSocketFactory().createSocket();
+- socket.bind(new InetSocketAddress(clientHost, clientPort));
+- socket.connect(new InetSocketAddress(remoteHost, remotePort), timeout);
++ Socket socket = getSocketFactory().createSocket(remoteHost, remotePort, clientHost, clientPort);
++// Socket socket = getSocketFactory().createSocket();
++// socket.bind(new InetSocketAddress(clientHost, clientPort));
++// socket.connect(new InetSocketAddress(remoteHost, remotePort), timeout);
+ return socket;
}
--
-- Socket socket = getSslContext().getSocketFactory().createSocket();
-- socket.bind(new InetSocketAddress(clientHost, clientPort));
-- socket.connect(new InetSocketAddress(remoteHost, remotePort), params.getConnectionTimeout());
-+
-+ Socket socket = getSslContext().getSocketFactory().createSocket(remoteHost, remotePort, clientHost, clientPort);
-+// socket.bind(new InetSocketAddress(clientHost, clientPort));
-+// socket.connect(new InetSocketAddress(remoteHost, remotePort), params.getConnectionTimeout());
- return socket;
}
-
Index: eclipse-mylar.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-mylar/devel/eclipse-mylar.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- eclipse-mylar.spec 18 Apr 2007 17:59:01 -0000 1.7
+++ eclipse-mylar.spec 1 May 2007 22:09:57 -0000 1.8
@@ -3,27 +3,17 @@
Name: eclipse-mylar
Summary: Mylar is a task-focused UI for Eclipse
-Version: 1.0
-Release: 4%{?dist}
+Version: 2.0
+Release: 0.1.M2a.1%{?dist}
License: Eclipse Public License
URL: http://www.eclipse.org/mylar
# mkdir temp && cd temp
# sh fetch-mylar.sh
-# tar cjf org.eclipse.mylar-R_1_0_0-fetched-src.tar.bz2 org.eclipse.mylar
-Source0: org.eclipse.mylar-R_1_0_0-fetched-src.tar.bz2
+# tar cjf org.eclipse.mylar-R_2_0_M2a_e_3_2-fetched-src.tar.bz2 org.eclipse.mylar
+Source0: org.eclipse.mylar-R_2_0_M2a_e_3_2-fetched-src.tar.bz2
Source1: fetch-mylar.sh
-# Unnecessary @Override statements
-# https://bugs.eclipse.org/bugs/show_bug.cgi?id=173171
-# wget https://bugs.eclipse.org/bugs/attachment.cgi?id=58665&action=view
-# workspace2regularpatch attachment.cgi?id=58665&action=view > \
-# eclipse-mylar-overrides.patch
-Patch0: %{name}-overrides.patch
-# These two plugins are missing their required bundle execution
-# environment - will file upstream
-Patch1: %{name}-web1.5.patch
-Patch2: %{name}-team1.5.patch
# SSLSocketFactory#createSocket() is not implemented in GNU Classpath
# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=31626
Patch3: %{name}-createSocketworkaround.patch
@@ -204,28 +194,23 @@
%prep
%setup -q -n org.eclipse.mylar
-%patch0 -p1
-pushd org.eclipse.mylar.tasks.web
-%patch1 -p0
-popd
-pushd org.eclipse.mylar.team
-%patch2 -p0
-popd
-pushd org.eclipse.mylar.tasks.core
+pushd org.eclipse.mylar
%patch3 -p0
popd
/bin/sh -x %{eclipse_base}/buildscripts/copy-platform SDK %{eclipse_base}
mkdir home
# symlink out to jars we built
-pushd org.eclipse.mylar.context.core/lib
+pushd org.eclipse.mylar/lib-httpclient
rm commons-*.jar
-rm ws-commons-*.jar
-rm xmlrpc*.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-logging-api.jar
ln -s %{_javadir}/commons-logging.jar
+popd
+pushd org.eclipse.mylar/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
@@ -328,28 +313,28 @@
%files bugzilla
%defattr(-,root,root,-)
-%{eclipse_base}/plugins/org.eclipse.mylar.bugzilla.core_1.0.0.jar
-%{eclipse_base}/plugins/org.eclipse.mylar.bugzilla.ui_1.0.0.jar
-%dir %{eclipse_base}/features/org.eclipse.mylar.bugzilla_feature_1.0.0
-%doc %{eclipse_base}/features/org.eclipse.mylar.bugzilla_feature_1.0.0/license.html
-%doc %{eclipse_base}/features/org.eclipse.mylar.bugzilla_feature_1.0.0/about.html
-%doc %{eclipse_base}/features/org.eclipse.mylar.bugzilla_feature_1.0.0/epl-v10.html
-%{eclipse_base}/features/org.eclipse.mylar.bugzilla_feature_1.0.0/feature.xml
+%{eclipse_base}/plugins/org.eclipse.mylar.bugzilla.core_*.jar
+%{eclipse_base}/plugins/org.eclipse.mylar.bugzilla.ui_*.jar
+%dir %{eclipse_base}/features/org.eclipse.mylar.bugzilla_feature_*
+%doc %{eclipse_base}/features/org.eclipse.mylar.bugzilla_feature_*/license.html
+%doc %{eclipse_base}/features/org.eclipse.mylar.bugzilla_feature_*/about.html
+%doc %{eclipse_base}/features/org.eclipse.mylar.bugzilla_feature_*/epl-v10.html
+%{eclipse_base}/features/org.eclipse.mylar.bugzilla_feature_*/feature.xml
%if %{gcj_support}
%{_libdir}/gcj/%{name}/org.eclipse.mylar.bugzilla*
%endif
%files ide
%defattr(-,root,root,-)
-%{eclipse_base}/plugins/org.eclipse.mylar.team_1.0.0.jar
-%{eclipse_base}/plugins/org.eclipse.mylar.context.ui_1.0.0.jar
-%{eclipse_base}/plugins/org.eclipse.mylar.java_1.0.0.jar
-%{eclipse_base}/plugins/org.eclipse.mylar.resources_1.0.0.jar
-%{eclipse_base}/plugins/org.eclipse.mylar.ide_1.0.0.jar
-%dir %{eclipse_base}/features/org.eclipse.mylar.ide_feature_1.0.0
-%doc %{eclipse_base}/features/org.eclipse.mylar.ide_feature_1.0.0/license.html
-%doc %{eclipse_base}/features/org.eclipse.mylar.ide_feature_1.0.0/epl-v10.html
-%{eclipse_base}/features/org.eclipse.mylar.ide_feature_1.0.0/feature.xml
+%{eclipse_base}/plugins/org.eclipse.mylar.team_*.jar
+%{eclipse_base}/plugins/org.eclipse.mylar.context.ui_*.jar
+%{eclipse_base}/plugins/org.eclipse.mylar.java_*.jar
+%{eclipse_base}/plugins/org.eclipse.mylar.resources_*.jar
+%{eclipse_base}/plugins/org.eclipse.mylar.ide_*.jar
+%dir %{eclipse_base}/features/org.eclipse.mylar.ide_feature_*
+%doc %{eclipse_base}/features/org.eclipse.mylar.ide_feature_*/license.html
+%doc %{eclipse_base}/features/org.eclipse.mylar.ide_feature_*/epl-v10.html
+%{eclipse_base}/features/org.eclipse.mylar.ide_feature_*/feature.xml
%if %{gcj_support}
%{_libdir}/gcj/%{name}/org.eclipse.mylar.team_*
%{_libdir}/gcj/%{name}/org.eclipse.mylar.context.ui_*
@@ -360,37 +345,43 @@
%files trac
%defattr(-,root,root,-)
-%{eclipse_base}/plugins/org.eclipse.mylar.trac.core_1.0.0.jar
-%{eclipse_base}/plugins/org.eclipse.mylar.trac.ui_1.0.0.jar
-%dir %{eclipse_base}/features/org.eclipse.mylar.trac_feature_1.0.0
-%{eclipse_base}/features/org.eclipse.mylar.trac_feature_1.0.0/feature.xml
+%{eclipse_base}/plugins/org.eclipse.mylar.trac.core_*.jar
+%{eclipse_base}/plugins/org.eclipse.mylar.trac.ui_*.jar
+%dir %{eclipse_base}/features/org.eclipse.mylar.trac_feature_*
+%{eclipse_base}/features/org.eclipse.mylar.trac_feature_*/feature.xml
%if %{gcj_support}
%{_libdir}/gcj/%{name}/org.eclipse.mylar.trac*
%endif
%files
%defattr(-,root,root,-)
-%{eclipse_base}/plugins/org.eclipse.mylar.tasks.web_1.0.0.jar
-%{eclipse_base}/plugins/org.eclipse.mylar.context.core_1.0.0.jar
-%{eclipse_base}/plugins/org.eclipse.mylar.tasks.ui_1.0.0.jar
-%{eclipse_base}/plugins/org.eclipse.mylar.tasks.core_1.0.0.jar
-%{eclipse_base}/plugins/org.eclipse.mylar_1.0.0.jar
-%{eclipse_base}/plugins/org.eclipse.mylar.monitor_1.0.0.jar
-%{eclipse_base}/plugins/org.eclipse.mylar.doc_1.0.0.jar
-%doc %{eclipse_base}/features/org.eclipse.mylar_feature_1.0.0/license.html
-%doc %{eclipse_base}/features/org.eclipse.mylar_feature_1.0.0/epl-v10.html
-%{eclipse_base}/features/org.eclipse.mylar_feature_1.0.0/feature.xml
+%{eclipse_base}/plugins/org.eclipse.mylar.tasks.web_*.jar
+%{eclipse_base}/plugins/org.eclipse.mylar.context.core_*.jar
+%{eclipse_base}/plugins/org.eclipse.mylar.tasks.ui_*.jar
+%{eclipse_base}/plugins/org.eclipse.mylar.tasks.core_*.jar
+%{eclipse_base}/plugins/org.eclipse.mylar_*.jar
+%{eclipse_base}/plugins/org.eclipse.mylar.monitor.core_*.jar
+%{eclipse_base}/plugins/org.eclipse.mylar.monitor.ui_*.jar
+%{eclipse_base}/plugins/org.eclipse.mylar.doc_*.jar
+%doc %{eclipse_base}/features/org.eclipse.mylar_feature_*/license.html
+%doc %{eclipse_base}/features/org.eclipse.mylar_feature_*/epl-v10.html
+%{eclipse_base}/features/org.eclipse.mylar_feature_*/feature.xml
%if %{gcj_support}
%{_libdir}/gcj/%{name}/org.eclipse.mylar.tasks.web_*
%{_libdir}/gcj/%{name}/org.eclipse.mylar.context.core_*
%{_libdir}/gcj/%{name}/org.eclipse.mylar.tasks.ui_*
%{_libdir}/gcj/%{name}/org.eclipse.mylar.tasks.core_*
-%{_libdir}/gcj/%{name}/org.eclipse.mylar.monitor_*
+%{_libdir}/gcj/%{name}/org.eclipse.mylar_*
+%{_libdir}/gcj/%{name}/org.eclipse.mylar.monitor.core_*
+%{_libdir}/gcj/%{name}/org.eclipse.mylar.monitor.ui_*
%{_libdir}/gcj/%{name}/org.eclipse.mylar.doc_*
%dir %{_libdir}/gcj/%{name}
%endif
%changelog
+* Wed Apr 25 2007 Andrew Overholt <overholt at redhat.com> 2.0-0.1.M2a.1
+- 2.0M2a (a re-tag to fix some tagging issues).
+
* Wed Apr 18 2007 Andrew Overholt <overholt at redhat.com> 1.0-4
- Add workaround for missing method in GNU Classpath.
Index: fetch-mylar.sh
===================================================================
RCS file: /cvs/extras/rpms/eclipse-mylar/devel/fetch-mylar.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fetch-mylar.sh 20 Mar 2007 15:32:18 -0000 1.1
+++ fetch-mylar.sh 1 May 2007 22:09:57 -0000 1.2
@@ -2,8 +2,6 @@
for f in \
org.eclipse.mylar \
-org.eclipse.mylar-site \
-org.eclipse.mylar.aspectj \
org.eclipse.mylar.bugzilla.core \
org.eclipse.mylar.bugzilla.ui \
org.eclipse.mylar.context.core \
@@ -21,13 +19,6 @@
org.eclipse.mylar.team \
org.eclipse.mylar.trac.core \
org.eclipse.mylar.trac.ui \
-org.eclipse.mylar.web \
-; do
-cvs -d:pserver:anonymous at dev.eclipse.org:/cvsroot/technology \
-export -r R_1_0_0 org.eclipse.mylar/$f;
-done
-
-for f in \
org.eclipse.mylar-feature \
org.eclipse.mylar.bugzilla-feature \
org.eclipse.mylar.ide-feature \
@@ -35,5 +26,5 @@
org.eclipse.mylar.java \
; do
cvs -d:pserver:anonymous at dev.eclipse.org:/cvsroot/technology \
-export -r R_1_0_0_e_3_2 org.eclipse.mylar/$f;
+export -r R_2_0_M2a_e_3_2 org.eclipse.mylar/$f;
done
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eclipse-mylar/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 20 Mar 2007 15:32:18 -0000 1.2
+++ sources 1 May 2007 22:09:57 -0000 1.3
@@ -1 +1 @@
-5f9bc1735f04fd172f5cba534ab1bec8 org.eclipse.mylar-R_1_0_0-fetched-src.tar.bz2
+92f8bc3ca0f4a5f7f0bad00dfad3c7f9 org.eclipse.mylar-R_2_0_M2a_e_3_2-fetched-src.tar.bz2
- Previous message (by thread): rpms/perl-Affix-Infix2Postfix/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
- Next message (by thread): rpms/eclipse-mylar/devel eclipse-mylar-team1.5.patch, 1.1, NONE eclipse-mylar-web1.5.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list