rpms/eclipse-mylyn/devel eclipse-mylyn-unpackwebcore.patch, NONE, 1.1 eclipse-mylyn-webcorejar.patch, NONE, 1.1 eclipse-mylyn.spec, 1.4, 1.5

[Andrew Overholt (overholt)]

Author: overholt

Update of /cvs/pkgs/rpms/eclipse-mylyn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11164

Modified Files:
	eclipse-mylyn.spec 
Added Files:
	eclipse-mylyn-unpackwebcore.patch 
	eclipse-mylyn-webcorejar.patch 
Log Message:
* Fri Sep 07 2007 Andrew Overholt <overholt at redhat.com> 2.0.0-5
- Make web.core its own jar.
- Unpack web.core so we can symlink to dependencies.
- Symlink to dependencies of web.core.
- Remove rome jar and exports from web.core.
- BR/R all the versions of dependencies that have OSGi manifests.

eclipse-mylyn-unpackwebcore.patch:

--- NEW FILE eclipse-mylyn-unpackwebcore.patch ---
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 @@
          download-size="0"
          install-size="0"
          version="2.0.0.v20070627-1400"
-         unpack="false"/>
+         unpack="true"/>
 
 
 </feature>

eclipse-mylyn-webcorejar.patch:

--- NEW FILE eclipse-mylyn-webcorejar.patch ---
### Eclipse Workspace Patch 1.0
#P org.eclipse.mylyn.web.core
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"/>
-	<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"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
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 @@
 # 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.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 @@
 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-codec-1.3.jar,
  lib-httpclient/commons-logging-1.0.4.jar,
@@ -16,21 +16,8 @@
  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
 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,



Index: eclipse-mylyn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-mylyn/devel/eclipse-mylyn.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- eclipse-mylyn.spec	24 Aug 2007 16:06:46 -0000	1.4
+++ eclipse-mylyn.spec	13 Sep 2007 17:41:47 -0000	1.5
@@ -1,10 +1,10 @@
-%define gcj_support         1
+%define gcj_support         0
 %define eclipse_base        %{_datadir}/eclipse
 
 Name: eclipse-mylyn 
 Summary: Mylyn is a task-focused UI for Eclipse
 Version: 2.0.0
-Release: 4%{?dist} 
+Release: 5%{?dist} 
 License: Eclipse Public License
 URL: http://www.eclipse.org/mylyn
 
@@ -21,6 +21,9 @@
 # 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
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -39,20 +42,20 @@
 
 BuildRequires: eclipse-pde >= 3.2.1
 BuildRequires: eclipse-cvs-client >= 3.2.1
-BuildRequires: jakarta-commons-codec
-BuildRequires: jakarta-commons-httpclient
+BuildRequires: jakarta-commons-codec >= 1.3-8jpp.2
+BuildRequires: jakarta-commons-httpclient >= 1:3.0.1-1jpp.2
 BuildRequires: jakarta-commons-logging
-BuildRequires: ws-commons-util
-BuildRequires: xmlrpc3-client
-BuildRequires: xmlrpc3-common
+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: jakarta-commons-codec
-Requires: jakarta-commons-httpclient
+Requires: jakarta-commons-codec >= 1.3-8jpp.2
+Requires: jakarta-commons-httpclient >= 1:3.0.1-1jpp.2
 Requires: jakarta-commons-logging
-Requires: ws-commons-util
-Requires: xmlrpc3-client
-Requires: xmlrpc3-common
+Requires: ws-commons-util >= 1.0.1-2
+Requires: xmlrpc3-client >= 3.0-1jpp.3
+Requires: xmlrpc3-common >= 3.0-1jpp.3
 Provides: eclipse-mylar = 2.0.0-1.fc7
 Obsoletes: eclipse-mylar < 2.0.0
 
@@ -128,8 +131,12 @@
 # GCJ issue
 pushd org.eclipse.mylyn.web.core
 %patch3 -p0
+%patch5
 popd
 
+# So we can symlink to dependencies
+%patch4
+
 /bin/sh -x %{eclipse_base}/buildscripts/copy-platform SDK %{eclipse_base}
 mkdir home
 
@@ -138,8 +145,8 @@
 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-logging-api.jar
-ln -s %{_javadir}/commons-logging.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
@@ -148,6 +155,10 @@
 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
 
 #sed --in-place "s/<import.*mylar.*\/>//" org.eclipse.mylyn-feature/feature.xml
 # remove references to mylar in feature
@@ -297,6 +308,26 @@
 unzip -q -d $RPM_BUILD_ROOT%{eclipse_base}/.. \
  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.0.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
+rm *.jar
+ln -s %{_javadir}/jdom-1.0.jar
+popd
+
 %if %{gcj_support}
 %{_bindir}/aot-compile-rpm
 %endif
@@ -385,7 +416,7 @@
 %files
 %defattr(-,root,root,-)
 %{eclipse_base}/plugins/org.eclipse.mylyn.help.ui_*.jar
-%{eclipse_base}/plugins/org.eclipse.mylyn.web.core_*.jar
+%{eclipse_base}/plugins/org.eclipse.mylyn.web.core_*
 %{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
@@ -416,6 +447,13 @@
 %endif
 
 %changelog
+* Fri Sep 07 2007 Andrew Overholt <overholt at redhat.com> 2.0.0-5
+- Make web.core its own jar.
+- Unpack web.core so we can symlink to dependencies.
+- Symlink to dependencies of web.core.
+- Remove rome jar and exports from web.core.
+- BR/R all the versions of dependencies that have OSGi manifests.
+
 * Fri Aug 24 2007 Andrew Overholt <overholt at redhat.com> 2.0.0-4
 - ExcludeArch ppc64 (no xmlrpc3 on ppc64 due to rh#239123).