[eclipse-mylyn-commons/cdaniel/370] Current state (*Very* ugly).
Krzysztof Daniel
kdaniel at fedoraproject.org
Mon Mar 26 10:13:06 UTC 2012
commit c57a739c8f13551738de044fa838aeb953d5c11b
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date: Mon Mar 26 12:12:37 2012 +0200
Current state (*Very* ugly).
eclipse-mylyn-commons-coreimport.patch | 15 +++
eclipse-mylyn-commons-httpimport.patch | 12 ++
eclipse-mylyn-commons-httpimport2.patch | 13 +++
eclipse-mylyn-commons-loose-imports.patch | 30 ++++++
eclipse-mylyn-commons-loosen-sources2.patch | 30 ++++++
eclipse-mylyn-commons-netimport.patch | 15 +++
eclipse-mylyn-commons-nosoap.patch | 20 ++++
eclipse-mylyn-commons-sdk-nosoap2.patch | 47 +++++++++
eclipse-mylyn-commons-sdk-nosoap3.patch | 23 ++++
eclipse-mylyn-commons-sdk-nosource.patch | 150 +++++++++++++++++++++++++++
eclipse-mylyn-commons.spec | 55 +++++++++-
sources | 2 +-
12 files changed, 408 insertions(+), 4 deletions(-)
---
diff --git a/eclipse-mylyn-commons-coreimport.patch b/eclipse-mylyn-commons-coreimport.patch
new file mode 100644
index 0000000..527c085
--- /dev/null
+++ b/eclipse-mylyn-commons-coreimport.patch
@@ -0,0 +1,15 @@
+--- org.eclipse.mylyn.monitor-feature/feature.xml.bak 2012-03-19 19:16:34.000000000 +0100
++++ org.eclipse.mylyn.monitor-feature/feature.xml 2012-03-26 11:03:10.110471533 +0200
+@@ -41,5 +41,12 @@
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
++
++ <plugin
++ id="org.eclipse.mylyn.context.core"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
++ unpack="false"/>
+
+ </feature>
diff --git a/eclipse-mylyn-commons-httpimport.patch b/eclipse-mylyn-commons-httpimport.patch
new file mode 100644
index 0000000..d3a1b9a
--- /dev/null
+++ b/eclipse-mylyn-commons-httpimport.patch
@@ -0,0 +1,12 @@
+--- org.eclipse.mylyn.commons.repositories.http-feature/feature.xml.bak 2012-03-26 11:42:04.943100605 +0200
++++ org.eclipse.mylyn.commons.repositories.http-feature/feature.xml 2012-03-26 11:41:16.222891405 +0200
+@@ -30,6 +30,9 @@
+
+ <requires>
+ <import feature="org.eclipse.mylyn.commons.repositories" version="0.9.0" match="greaterOrEqual"/>
++ <import plugin="org.apache.httpcomponents.httpclient"/>
++ <import plugin="org.apache.httpcomponents.httpcore"/>
++ <import plugin="javax.xml"/>
+ </requires>
+
+ <plugin
diff --git a/eclipse-mylyn-commons-httpimport2.patch b/eclipse-mylyn-commons-httpimport2.patch
new file mode 100644
index 0000000..d481204
--- /dev/null
+++ b/eclipse-mylyn-commons-httpimport2.patch
@@ -0,0 +1,13 @@
+--- org.eclipse.mylyn.commons.repositories.http.core/META-INF/MANIFEST.MF.bak 2012-03-26 11:48:27.000000000 +0200
++++ org.eclipse.mylyn.commons.repositories.http.core/META-INF/MANIFEST.MF 2012-03-26 11:58:56.564375174 +0200
+@@ -9,7 +9,9 @@
+ Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.core.net,
+ org.eclipse.mylyn.commons.core,
+- org.eclipse.mylyn.commons.repositories.core
++ org.eclipse.mylyn.commons.repositories.core,
++ org.eclipse.osgi,
++ org.apache.httpcomponents.httpcore
+ Bundle-ClassPath: .
+ Export-Package: org.eclipse.mylyn.commons.repositories.http.core;x-internal:=true,
+ org.eclipse.mylyn.internal.commons.repositories.http.core;x-internal:=true
diff --git a/eclipse-mylyn-commons-loose-imports.patch b/eclipse-mylyn-commons-loose-imports.patch
new file mode 100644
index 0000000..e9dbaf2
--- /dev/null
+++ b/eclipse-mylyn-commons-loose-imports.patch
@@ -0,0 +1,30 @@
+--- org.eclipse.mylyn.commons.repositories.http.core/META-INF/MANIFEST.MF.bak 2012-03-19 19:16:34.000000000 +0100
++++ org.eclipse.mylyn.commons.repositories.http.core/META-INF/MANIFEST.MF 2012-03-23 14:53:16.610568971 +0100
+@@ -21,15 +21,15 @@
+ org.apache.http.protocol;version="4.1.4",
+ org.apache.http.util;version="4.1.4",
+ org.apache.http.impl;version="4.1.4",
+- org.apache.http.auth;version="4.1.2",
+- org.apache.http.auth.params;version="4.1.2",
+- org.apache.http.client;version="4.1.2",
+- org.apache.http.client.methods;version="4.1.2",
+- org.apache.http.client.params;version="4.1.2",
+- org.apache.http.client.protocol;version="4.1.2",
+- org.apache.http.conn;version="4.1.2",
+- org.apache.http.conn.params;version="4.1.2",
+- org.apache.http.conn.scheme;version="4.1.2",
+- org.apache.http.impl.auth;version="4.1.2",
+- org.apache.http.impl.conn.tsccm;version="4.1.2",
+- org.apache.http.impl.client;version="4.1.2"
++ javax.xml
++
++
++
++
++
++
++
++
++
++
++
diff --git a/eclipse-mylyn-commons-loosen-sources2.patch b/eclipse-mylyn-commons-loosen-sources2.patch
new file mode 100644
index 0000000..ece003f
--- /dev/null
+++ b/eclipse-mylyn-commons-loosen-sources2.patch
@@ -0,0 +1,30 @@
+--- org.eclipse.mylyn.commons.repositories.http.tests/META-INF/MANIFEST.MF.bak 2012-03-19 19:16:34.000000000 +0100
++++ org.eclipse.mylyn.commons.repositories.http.tests/META-INF/MANIFEST.MF 2012-03-23 15:08:48.505644084 +0100
+@@ -20,15 +20,15 @@
+ org.apache.http.protocol;version="4.1.4",
+ org.apache.http.util;version="4.1.4",
+ org.apache.http.impl;version="4.1.4",
+- org.apache.http.auth;version="4.1.2",
+- org.apache.http.auth.params;version="4.1.2",
+- org.apache.http.client;version="4.1.2",
+- org.apache.http.client.methods;version="4.1.2",
+- org.apache.http.client.params;version="4.1.2",
+- org.apache.http.client.protocol;version="4.1.2",
+- org.apache.http.conn;version="4.1.2",
+- org.apache.http.conn.params;version="4.1.2",
+- org.apache.http.conn.scheme;version="4.1.2",
+- org.apache.http.impl.auth;version="4.1.2",
+- org.apache.http.impl.conn.tsccm;version="4.1.2",
+- org.apache.http.impl.client;version="4.1.2"
++ javax.xml
++
++
++
++
++
++
++
++
++
++
++
diff --git a/eclipse-mylyn-commons-netimport.patch b/eclipse-mylyn-commons-netimport.patch
new file mode 100644
index 0000000..22977f1
--- /dev/null
+++ b/eclipse-mylyn-commons-netimport.patch
@@ -0,0 +1,15 @@
+--- org.eclipse.mylyn.discovery-feature/feature.xml.bak 2012-03-19 19:16:34.000000000 +0100
++++ org.eclipse.mylyn.discovery-feature/feature.xml 2012-03-26 10:56:29.441774468 +0200
+@@ -41,5 +41,12 @@
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
++
++ <plugin
++ id="org.eclipse.mylyn.commons.net"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
++ unpack="false"/>
+
+ </feature>
diff --git a/eclipse-mylyn-commons-nosoap.patch b/eclipse-mylyn-commons-nosoap.patch
new file mode 100644
index 0000000..f08d9fd
--- /dev/null
+++ b/eclipse-mylyn-commons-nosoap.patch
@@ -0,0 +1,20 @@
+--- org.eclipse.mylyn.commons.sdk-feature/feature.xml. bak 2012-03-19 19:16:34.000000000 +0100
++++ org.eclipse.mylyn.commons.sdk-feature/feature.xml 2012-03-24 20:59:48.893383043 +0100
+@@ -71,7 +71,7 @@
+ version="0.0.0"
+ unpack="false"/>
+
+- <plugin
++ <!--plugin
+ id="org.eclipse.mylyn.commons.soap"
+ download-size="0"
+ install-size="0"
+@@ -83,7 +83,7 @@
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+- unpack="false"/>
++ unpack="false"/-->
+
+ <!-- sdk bundles -->
+
diff --git a/eclipse-mylyn-commons-sdk-nosoap2.patch b/eclipse-mylyn-commons-sdk-nosoap2.patch
new file mode 100644
index 0000000..3252439
--- /dev/null
+++ b/eclipse-mylyn-commons-sdk-nosoap2.patch
@@ -0,0 +1,47 @@
+--- org.eclipse.mylyn.commons.sdk-feature/feature.xml.bak 2012-03-26 08:57:12.000000000 +0200
++++ org.eclipse.mylyn.commons.sdk-feature/feature.xml 2012-03-26 09:00:35.826692148 +0200
+@@ -98,13 +98,6 @@
+ <!-- Orbit bundles -->
+
+ <plugin
+- id="org.apache.xmlrpc"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+-
+- <plugin
+ id="org.apache.ws.commons.util"
+ download-size="0"
+ install-size="0"
+@@ -118,30 +111,6 @@
+ version="0.0.0"
+ unpack="false"/>
+
+- <plugin
+- id="org.apache.axis"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"/>
+-
+- <plugin
+- id="javax.wsdl"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+-
+- <plugin
+- id="javax.xml.rpc"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"/>
+-
+- <plugin
+- id="javax.xml.soap"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"/>
+
+ <plugin
+ id="org.apache.commons.discovery"
diff --git a/eclipse-mylyn-commons-sdk-nosoap3.patch b/eclipse-mylyn-commons-sdk-nosoap3.patch
new file mode 100644
index 0000000..60eacd9
--- /dev/null
+++ b/eclipse-mylyn-commons-sdk-nosoap3.patch
@@ -0,0 +1,23 @@
+--- org.eclipse.mylyn.commons.sdk-feature/feature.xml.bak 2012-03-26 09:27:07.000000000 +0200
++++ org.eclipse.mylyn.commons.sdk-feature/feature.xml 2012-03-26 09:29:54.975192744 +0200
+@@ -126,20 +126,6 @@
+ unpack="false"/>
+
+ <plugin
+- id="javax.activation"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+-
+- <plugin
+- id="javax.mail"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+-
+- <plugin
+ id="org.apache.commons.codec"
+ download-size="0"
+ install-size="0"
diff --git a/eclipse-mylyn-commons-sdk-nosource.patch b/eclipse-mylyn-commons-sdk-nosource.patch
new file mode 100644
index 0000000..f9452a1
--- /dev/null
+++ b/eclipse-mylyn-commons-sdk-nosource.patch
@@ -0,0 +1,150 @@
+--- org.eclipse.mylyn.commons.sdk-feature/feature.xml.bak 2012-03-26 08:41:38.000000000 +0200
++++ org.eclipse.mylyn.commons.sdk-feature/feature.xml 2012-03-26 08:48:41.935231482 +0200
+@@ -94,147 +94,6 @@
+ version="0.0.0"
+ unpack="false"/>
+
+- <!-- source bundles -->
+-
+- <plugin
+- id="org.eclipse.mylyn.commons.core.source"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+-
+- <plugin
+- id="org.eclipse.mylyn.commons.identity.core.source"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+-
+- <plugin
+- id="org.eclipse.mylyn.commons.identity.ui.source"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+-
+- <plugin
+- id="org.eclipse.mylyn.commons.net.source"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+-
+- <plugin
+- id="org.eclipse.mylyn.commons.notifications.core.source"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+-
+- <plugin
+- id="org.eclipse.mylyn.commons.notifications.feed.source"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+-
+- <plugin
+- id="org.eclipse.mylyn.commons.notifications.ui.source"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+-
+- <plugin
+- id="org.eclipse.mylyn.commons.repositories.core.source"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+-
+- <plugin
+- id="org.eclipse.mylyn.commons.repositories.ui.source"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+-
+- <plugin
+- id="org.eclipse.mylyn.commons.repositories.http.core.source"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+-
+- <plugin
+- id="org.eclipse.mylyn.commons.screenshots.source"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+-
+- <plugin
+- id="org.eclipse.mylyn.commons.sdk.util.source"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+-
+- <plugin
+- id="org.eclipse.mylyn.commons.soap.source"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+-
+- <plugin
+- id="org.eclipse.mylyn.commons.ui.source"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+-
+- <plugin
+- id="org.eclipse.mylyn.commons.workbench.source"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+-
+- <plugin
+- id="org.eclipse.mylyn.commons.xmlrpc.source"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+-
+- <plugin
+- id="org.eclipse.mylyn.discovery.core.source"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+-
+- <plugin
+- id="org.eclipse.mylyn.discovery.ui.source"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+-
+- <plugin
+- id="org.eclipse.mylyn.monitor.core.source"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+-
+- <plugin
+- id="org.eclipse.mylyn.monitor.ui.source"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+
+ <!-- Orbit bundles -->
+
diff --git a/eclipse-mylyn-commons.spec b/eclipse-mylyn-commons.spec
index a7c13e6..35d6a76 100644
--- a/eclipse-mylyn-commons.spec
+++ b/eclipse-mylyn-commons.spec
@@ -8,7 +8,7 @@
Name: eclipse-mylyn-commons
Summary: Common libraries for Eclipse Mylyn
Version: 3.7.0
-Release: 1%{?dist}
+Release: 2%{?dist}
License: EPL and ASL 2.0
URL: http://www.eclipse.org/mylyn
@@ -21,6 +21,16 @@ Source0: http://git.eclipse.org/c/mylyn/org.eclipse.mylyn.commons.git/snapshot/R
# It changes the Bundle-Require header to
# Import-Package
Patch0: %{name}-xmlrpc-import-package-manifest-fix.patch
+Patch1: %{name}-loose-imports.patch
+Patch2: eclipse-mylyn-commons-nosoap.patch
+Patch3: eclipse-mylyn-commons-sdk-nosource.patch
+Patch4: eclipse-mylyn-commons-sdk-nosoap2.patch
+Patch5: eclipse-mylyn-commons-sdk-nosoap3.patch
+Patch6: eclipse-mylyn-commons-sdk-nosoap4.patch
+Patch7: eclipse-mylyn-commons-netimport.patch
+Patch8: eclipse-mylyn-commons-coreimport.patch
+Patch9: eclipse-mylyn-commons-httpimport.patch
+Patch10: eclipse-mylyn-commons-httpimport2.patch
BuildRequires: java-devel >= 1.7.0
BuildRequires: jpackage-utils
@@ -33,6 +43,14 @@ BuildRequires: xmlrpc3-client >= 3.0-2.8
BuildRequires: xmlrpc3-common >= 3.0-2.8
BuildRequires: ws-jaxme >= 0.5.1-2.4
BuildRequires: jdom >= 1.0-5.5
+BuildRequires: rome
+BuildRequires: jakarta-commons-httpclient
+BuildRequires: geronimo-jaxrpc
+BuildRequires: httpcomponents-client
+BuildRequires: httpcomponents-core
+# The following is required for javax.xml.stream (apparently openjdk ships it too)
+# not sure what's best here.
+BuildRequires: xml-commons-apis
Requires: eclipse-platform >= 1:3.8.0
Requires: apache-commons-lang >= 2.3-2.3
Requires: apache-commons-logging
@@ -42,6 +60,11 @@ Requires: xmlrpc3-client >= 3.0-2.8
Requires: xmlrpc3-common >= 3.0-2.8
Requires: ws-jaxme >= 0.5.1-2.4
Requires: jpackage-utils
+Requires: rome
+Requires: jakarta-commons-httpclient
+Requires: xml-commons-apis
+Requires: httpcomponents-client
+Requires: httpcomponents-core
Group: Development/Tools
@@ -58,19 +81,41 @@ rm -rf orbitDeps
mkdir orbitDeps
pushd orbitDeps
ln -s %{_javadir}/apache-commons-lang.jar
+ln -s %{_javadir}/httpcomponents/httpcore.jar
+ln -s %{_javadir}/httpcomponents/httpclient.jar
+ln -s %{_javadir}/commons-httpclient.jar
ln -s %{_javadir}/apache-commons-io.jar
ln -s %{_javadir}/apache-commons-logging-api.jar
+ln -s %{_javadir}/apache-commons-discovery.jar
ln -s %{_javadir}/xmlrpc3-client.jar
ln -s %{_javadir}/xmlrpc3-common.jar
ln -s %{_javadir}/ws-commons-util.jar
ln -s %{_javadir}/jdom.jar
+ln -s %{_javadir}/hamcrest/core.jar
ln -s %{_javadir}/jaxme/jaxmeapi.jar
+ln -s %{_javadir}/rome*.jar
+ln -s %{_javadir}/jaxrpc.jar
+ln -s %{_javadir}/axis/axis.jar
+ln -s %{_javadir}/jaxp.jar
popd
-
+#ls -1 | grep -vE 'org.eclipse.mylyn.*.tests' | xargs rm -rf
+ls -1 | grep 'org.eclipse.mylyn.*.tests' | xargs rm -rf
%patch0
+%patch1
+%patch2
+%patch3
+%patch4
+%patch5
+#%patch6
+%patch7
+%patch8
+%patch9
+%patch10
+
%build
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.mylyn.commons \
+
+%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.mylyn.commons.sdk \
-a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier} -DmylynQualifier=%{qualifier}" \
-j "-DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar " \
-o `pwd`/orbitDeps
@@ -86,6 +131,7 @@ pushd %{buildroot}%{install_loc}/mylyn-commons/eclipse/plugins
ln -s %{_javadir}/apache-commons-lang.jar
ln -s %{_javadir}/apache-commons-io.jar
ln -s %{_javadir}/apache-commons-logging-api.jar
+ln -s %{_javadir}/commons-httpclient.jar
ln -s %{_javadir}/xmlrpc3-client.jar
ln -s %{_javadir}/xmlrpc3-common.jar
ln -s %{_javadir}/ws-commons-util.jar
@@ -101,6 +147,9 @@ popd
%doc org.eclipse.mylyn.commons-feature/license.html
%changelog
+* Fri Mar 23 2012 Krzysztof Daniel <kdaniel at redhat.com> 3.7.0-2
+- Build all features.
+
* Fri Mar 23 2012 Krzysztof Daniel <kdaniel at redhat.com> 3.7.0-1
- Update to upstream 3.7.0 release.
diff --git a/sources b/sources
index fa77ee4..501f36a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e9c1d70f208bfb25fe54ed642f7342a5 R_3_7_0.tar.bz2
+27e4ad396fc18b6e8bf5c3da9d512c67 R_3_7_0.tar.bz2
More information about the scm-commits
mailing list