[eclipse-mylyn-commons/f17] Build source bundles && Update minimum dependency to commons-io.
Krzysztof Daniel
kdaniel at fedoraproject.org
Wed May 2 09:12:51 UTC 2012
commit 9bf4f6f2431868c8c53aabca990761dcf9161ec2
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date: Wed May 2 11:09:37 2012 +0200
Build source bundles && Update minimum dependency to commons-io.
eclipse-mylyn-commons-fix-identity-ui.patch | 15 ++
eclipse-mylyn-commons-main-feature-fix.patch | 191 ++++++--------------------
eclipse-mylyn-commons.spec | 28 +++--
3 files changed, 75 insertions(+), 159 deletions(-)
---
diff --git a/eclipse-mylyn-commons-fix-identity-ui.patch b/eclipse-mylyn-commons-fix-identity-ui.patch
new file mode 100644
index 0000000..328e0f9
--- /dev/null
+++ b/eclipse-mylyn-commons-fix-identity-ui.patch
@@ -0,0 +1,15 @@
+--- org.eclipse.mylyn.commons.identity-feature/feature.xml.bak 2012-03-19 19:16:34.000000000 +0100
++++ org.eclipse.mylyn.commons.identity-feature/feature.xml 2012-05-02 10:29:45.076166879 +0200
+@@ -41,5 +41,12 @@
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
++
++ <plugin
++ id="org.eclipse.mylyn.commons.identity.ui"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
++ unpack="false"/>
+
+ </feature>
diff --git a/eclipse-mylyn-commons-main-feature-fix.patch b/eclipse-mylyn-commons-main-feature-fix.patch
index cbc5c61..eafce3b 100644
--- a/eclipse-mylyn-commons-main-feature-fix.patch
+++ b/eclipse-mylyn-commons-main-feature-fix.patch
@@ -13,155 +13,6 @@
<plugin
id="org.eclipse.mylyn.commons.xmlrpc"
-@@ -94,148 +88,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 -->
-
- <plugin
@@ -260,31 +112,6 @@
unpack="false"/>
@@ -215,3 +66,45 @@
unpack="false"/>
<plugin
+--- org.eclipse.mylyn.commons.sdk-feature/build.properties.bak 2012-03-19 19:16:34.000000000 +0100
++++ org.eclipse.mylyn.commons.sdk-feature/build.properties 2012-05-01 20:52:15.073162888 +0200
+@@ -12,3 +12,22 @@
+ feature.xml,\
+ epl-v10.html,\
+ license.html
++generate.plugin at org.eclipse.mylyn.commons.core.source=org.eclipse.mylyn.commons.core
++generate.plugin at org.eclipse.mylyn.commons.identity.core.source=org.eclipse.mylyn.commons.identity.core
++generate.plugin at org.eclipse.mylyn.commons.identity.ui.source=org.eclipse.mylyn.commons.identity.ui
++generate.plugin at org.eclipse.mylyn.commons.net.source= org.eclipse.mylyn.commons.net
++generate.plugin at org.eclipse.mylyn.commons.notifications.core.source=org.eclipse.mylyn.commons.notifications.core
++generate.plugin at org.eclipse.mylyn.commons.notifications.feed.source=org.eclipse.mylyn.commons.notifications.feed
++generate.plugin at org.eclipse.mylyn.commons.notifications.ui.source=org.eclipse.mylyn.commons.notifications.ui
++generate.plugin at org.eclipse.mylyn.commons.repositories.core.source=org.eclipse.mylyn.commons.repositories.core
++generate.plugin at org.eclipse.mylyn.commons.repositories.ui.source=org.eclipse.mylyn.commons.repositories.ui
++generate.plugin at org.eclipse.mylyn.commons.repositories.http.core.source=org.eclipse.mylyn.commons.repositories.http.core
++generate.plugin at org.eclipse.mylyn.commons.screenshots.source=org.eclipse.mylyn.commons.screenshots
++generate.plugin at org.eclipse.mylyn.commons.sdk.util.source=org.eclipse.mylyn.commons.sdk.util
++generate.plugin at org.eclipse.mylyn.commons.ui.source=org.eclipse.mylyn.commons.ui
++generate.plugin at org.eclipse.mylyn.commons.workbench.source=org.eclipse.mylyn.commons.workbench
++generate.plugin at org.eclipse.mylyn.commons.xmlrpc.source=org.eclipse.mylyn.commons.xmlrpc
++generate.plugin at org.eclipse.mylyn.discovery.core.source=org.eclipse.mylyn.discovery.core
++generate.plugin at org.eclipse.mylyn.discovery.ui.source=org.eclipse.mylyn.discovery.ui
++generate.plugin at org.eclipse.mylyn.monitor.core.source=org.eclipse.mylyn.monitor.core
++generate.plugin at org.eclipse.mylyn.monitor.ui.source=org.eclipse.mylyn.monitor.ui
+\ No newline at end of file
+--- org.eclipse.mylyn.commons.sdk-feature/feature.xml.bak 2012-05-01 21:12:08.000000000 +0200
++++ org.eclipse.mylyn.commons.sdk-feature/feature.xml 2012-05-01 21:14:32.196292426 +0200
+@@ -175,13 +175,6 @@
+ 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"
diff --git a/eclipse-mylyn-commons.spec b/eclipse-mylyn-commons.spec
index b963826..47aa423 100644
--- a/eclipse-mylyn-commons.spec
+++ b/eclipse-mylyn-commons.spec
@@ -7,7 +7,7 @@
Name: eclipse-mylyn-commons
Summary: Common libraries for Eclipse Mylyn
Version: 3.7.0
-Release: 11%{?dist}
+Release: 12%{?dist}
License: EPL and ASL 2.0
URL: http://www.eclipse.org/mylyn
@@ -43,12 +43,14 @@ Patch4: %{name}-httpimport.patch
# Imports must match available apache version.
Patch5: %{name}-fix-apache-import-version.patch
+
+Patch6: %{name}-fix-identity-ui.patch
BuildRequires: java-devel >= 1.7.0
BuildRequires: jpackage-utils
BuildRequires: eclipse-pde >= 1:4.2.0
BuildRequires: apache-commons-lang >= 2.6-6
BuildRequires: apache-commons-logging
-BuildRequires: apache-commons-io
+BuildRequires: apache-commons-io >= 2.3
BuildRequires: ws-commons-util >= 1.0.1-21
BuildRequires: xmlrpc3-client >= 3.1.3-8
BuildRequires: xmlrpc3-common >= 3.1.3-8
@@ -64,7 +66,7 @@ BuildRequires: xml-commons-apis
Requires: eclipse-platform >= 1:4.2.0
Requires: apache-commons-lang >= 2.6-6
Requires: apache-commons-logging
-Requires: apache-commons-io
+Requires: apache-commons-io >= 2.3
Requires: ws-commons-util >= 1.0.1-21
Requires: xmlrpc3-client >= 3.1.3-8
Requires: xmlrpc3-common >= 3.1.3-8
@@ -117,17 +119,22 @@ ls -1 | grep 'org.eclipse.mylyn.*.tests' | xargs rm -rf
%patch3
%patch4
%patch5
+%patch6
%build
-eclipse-pdebuild -f org.eclipse.mylyn.commons.sdk \
+eclipse-pdebuild -f org.eclipse.mylyn.commons \
-a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier} -DmylynQualifier=%{qualifier}" \
-o `pwd`/orbitDeps
-eclipse-pdebuild -f org.eclipse.mylyn.commons \
+eclipse-pdebuild -f org.eclipse.mylyn.commons.identity \
-a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier} -DmylynQualifier=%{qualifier}" \
-o `pwd`/orbitDeps
+eclipse-pdebuild -f org.eclipse.mylyn.commons.sdk \
+ -a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier} -DmylynQualifier=%{qualifier} -DindividualSourceBundles=true" \
+ -o `pwd`/orbitDeps
+
eclipse-pdebuild -f org.eclipse.mylyn.commons.activity \
-a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier} -DmylynQualifier=%{qualifier}" \
-o `pwd`/orbitDeps
@@ -136,7 +143,8 @@ eclipse-pdebuild -f org.eclipse.mylyn.commons.compatibility \
-a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier} -DmylynQualifier=%{qualifier}" \
-o `pwd`/orbitDeps
-eclipse-pdebuild -f org.eclipse.mylyn.commons.identity \
+
+eclipse-pdebuild -f org.eclipse.mylyn.discovery \
-a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier} -DmylynQualifier=%{qualifier}" \
-o `pwd`/orbitDeps
@@ -152,10 +160,6 @@ eclipse-pdebuild -f org.eclipse.mylyn.commons.repositories.http \
-a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier} -DmylynQualifier=%{qualifier}" \
-o `pwd`/orbitDeps
-eclipse-pdebuild -f org.eclipse.mylyn.discovery \
- -a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier} -DmylynQualifier=%{qualifier}" \
- -o `pwd`/orbitDeps
-
eclipse-pdebuild -f org.eclipse.mylyn.monitor \
-a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier} -DmylynQualifier=%{qualifier}" \
-o `pwd`/orbitDeps
@@ -239,6 +243,10 @@ popd
%doc org.eclipse.mylyn.commons-feature/license.html
%changelog
+* Wed May 2 2012 Krzysztof Daniel <kdaniel at redhat.com> 3.7.0-12
+- Build source bundles.
+- Update minimum dependency to commons-io.
+
* Thu Apr 19 2012 Krzysztof Daniel <kdaniel at redhat.com> 3.7.0-10
- Bug 812791 - Bundles several libraries
More information about the scm-commits
mailing list