From ca3d32e72974363871c52c4a2a0521201754850b Mon Sep 17 00:00:00 2001 From: Krzysztof Daniel Date: Mar 01 2013 11:30:22 +0000 Subject: Update to latest upstream. & Initial SCLization. --- diff --git a/.gitignore b/.gitignore index 70d8782..a8fb3a3 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,6 @@ eclipse-mylyn-R_3_8_1-fetched-src.tar.bz2 /eclipse-mylyn-178f80619dd7fb7ce5f3e79d42d7b87abec198ec-incubator-fetched-src.tar.bz2 /eclipse-mylyn-R_3_8_2-fetched-src.tar.bz2 /eclipse-mylyn-R_3_8_2-fetched-src +/eclipse-mylyn-77b5432b77c14b1317751eac67156805d00053bc-incubator-fetched-src.tar.bz2 +/eclipse-mylyn-f9e1cd2b2977e5ad9a0615b3b0f7740a5ac3eb1e-fetched-src.tar.bz2 +/eclipse-mylyn-f9e1cd2b2977e5ad9a0615b3b0f7740a5ac3eb1e-fetched-src diff --git a/eclipse-mylyn-adjust-lucene-version.patch b/eclipse-mylyn-adjust-lucene-version.patch index b494987..c61d76e 100644 --- a/eclipse-mylyn-adjust-lucene-version.patch +++ b/eclipse-mylyn-adjust-lucene-version.patch @@ -1,81 +1,11 @@ ---- org.eclipse.mylyn.tasks/org.eclipse.mylyn.tasks.index.core/META-INF/MANIFEST.MF.bak 2012-07-02 09:23:09.000000000 +0200 -+++ org.eclipse.mylyn.tasks/org.eclipse.mylyn.tasks.index.core/META-INF/MANIFEST.MF 2012-07-09 10:18:36.787041547 +0200 +--- org.eclipse.mylyn.tasks/org.eclipse.mylyn.tasks.index.core/META-INF/MANIFEST.MF.bak 2013-03-01 10:14:29.000000000 +0100 ++++ org.eclipse.mylyn.tasks/org.eclipse.mylyn.tasks.index.core/META-INF/MANIFEST.MF 2013-03-01 10:33:53.684644890 +0100 @@ -7,7 +7,7 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.mylyn.tasks.core;bundle-version="3.8.0", org.eclipse.mylyn.commons.core;bundle-version="3.8.0", -- org.apache.lucene.core;bundle-version="[2.9.1,3.0.0)" -+ org.apache.lucene.core +- org.apache.lucene.core;bundle-version="[2.9.1,3.6.0)" ++ org.apache.lucene.core;bundle-version="[2.9.1,3.7.0)" Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.mylyn.internal.tasks.index.core;x-internal:=true ---- org.eclipse.mylyn.tasks/org.eclipse.mylyn-feature/feature.xml.bak 2012-07-02 09:23:09.000000000 +0200 -+++ org.eclipse.mylyn.tasks/org.eclipse.mylyn-feature/feature.xml 2012-07-09 10:41:29.526009473 +0200 -@@ -38,7 +38,7 @@ - - - -- -+ - - - ---- org.eclipse.mylyn.tasks/org.eclipse.mylyn.tasks.index.core/src/org/eclipse/mylyn/internal/tasks/index/core/TaskAnalyzer.java.bak 2012-07-02 09:23:09.000000000 +0200 -+++ org.eclipse.mylyn.tasks/org.eclipse.mylyn.tasks.index.core/src/org/eclipse/mylyn/internal/tasks/index/core/TaskAnalyzer.java 2012-07-09 12:49:08.508391039 +0200 -@@ -20,13 +20,20 @@ - * - * @author David Green - */ --class TaskAnalyzer extends PerFieldAnalyzerWrapper { -+class TaskAnalyzer { - -- public TaskAnalyzer() { -- super(new StandardAnalyzer(Version.LUCENE_CURRENT)); -- addAnalyzer(TaskListIndex.FIELD_IDENTIFIER.getIndexKey(), new KeywordAnalyzer()); -- addAnalyzer(TaskListIndex.FIELD_TASK_KEY.getIndexKey(), new KeywordAnalyzer()); -- addAnalyzer(TaskListIndex.FIELD_REPOSITORY_URL.getIndexKey(), new KeywordAnalyzer()); -+// public TaskAnalyzer() { -+// super(new StandardAnalyzer(Version.LUCENE_CURRENT)); -+// addAnalyzer(TaskListIndex.FIELD_IDENTIFIER.getIndexKey(), new KeywordAnalyzer()); -+// addAnalyzer(TaskListIndex.FIELD_TASK_KEY.getIndexKey(), new KeywordAnalyzer()); -+// addAnalyzer(TaskListIndex.FIELD_REPOSITORY_URL.getIndexKey(), new KeywordAnalyzer()); -+// } -+ -+ public static PerFieldAnalyzerWrapper instance() { -+ PerFieldAnalyzerWrapper wrapper = new PerFieldAnalyzerWrapper(new StandardAnalyzer(Version.LUCENE_CURRENT)); -+ wrapper.addAnalyzer(TaskListIndex.FIELD_IDENTIFIER.getIndexKey(), new KeywordAnalyzer()); -+ wrapper.addAnalyzer(TaskListIndex.FIELD_TASK_KEY.getIndexKey(), new KeywordAnalyzer()); -+ wrapper.addAnalyzer(TaskListIndex.FIELD_REPOSITORY_URL.getIndexKey(), new KeywordAnalyzer()); -+ return wrapper; - } -- - } ---- org.eclipse.mylyn.tasks/org.eclipse.mylyn.tasks.index.core/src/org/eclipse/mylyn/internal/tasks/index/core/TaskListIndex.java.bak 2012-07-02 09:23:09.000000000 +0200 -+++ org.eclipse.mylyn.tasks/org.eclipse.mylyn.tasks.index.core/src/org/eclipse/mylyn/internal/tasks/index/core/TaskListIndex.java 2012-07-09 12:46:43.953409552 +0200 -@@ -682,7 +682,7 @@ - if (!hasBooleanSpecifiers && defaultField.equals(FIELD_SUMMARY) && !containsSpecialCharacters(patternString)) { - return new PrefixQuery(new Term(defaultField.getIndexKey(), patternString)); - } -- QueryParser qp = new QueryParser(Version.LUCENE_CURRENT, defaultField.getIndexKey(), new TaskAnalyzer()); -+ QueryParser qp = new QueryParser(Version.LUCENE_CURRENT, defaultField.getIndexKey(), TaskAnalyzer.instance()); - Query q; - try { - q = qp.parse(patternString); -@@ -1117,7 +1117,7 @@ - } - - if (writer == null) { -- writer = new IndexWriter(directory, new TaskAnalyzer(), false, -+ writer = new IndexWriter(directory, TaskAnalyzer.instance(), false, - IndexWriter.MaxFieldLength.UNLIMITED); - } - -@@ -1171,7 +1171,7 @@ - - monitor.beginTask(Messages.TaskListIndex_task_rebuilding_index, taskListState.indexableTasks.size()); - try { -- final IndexWriter writer = new IndexWriter(directory, new TaskAnalyzer(), true, -+ final IndexWriter writer = new IndexWriter(directory, TaskAnalyzer.instance(), true, - IndexWriter.MaxFieldLength.UNLIMITED); - try { - diff --git a/eclipse-mylyn-compatibility-pom.xml b/eclipse-mylyn-compatibility-pom.xml index de82ab9..e43911a 100644 --- a/eclipse-mylyn-compatibility-pom.xml +++ b/eclipse-mylyn-compatibility-pom.xml @@ -3,7 +3,7 @@ org.eclipse.mylyn.commons-parent org.eclipse.mylyn.commons - 3.8.2-SNAPSHOT + 3.9.0-SNAPSHOT org.eclipse.core.runtime.compatibility.auth 3.2.200-SNAPSHOT diff --git a/eclipse-mylyn-hudson-feature-remove-unnecessary-imports.patch b/eclipse-mylyn-hudson-feature-remove-unnecessary-imports.patch index 51eaca2..e2081f0 100644 --- a/eclipse-mylyn-hudson-feature-remove-unnecessary-imports.patch +++ b/eclipse-mylyn-hudson-feature-remove-unnecessary-imports.patch @@ -9,8 +9,8 @@ - - - - + + --- org.eclipse.mylyn.builds/org.eclipse.mylyn.builds.sdk-feature/feature.xml.bak 2012-07-02 09:22:00.000000000 +0200 +++ org.eclipse.mylyn.builds/org.eclipse.mylyn.builds.sdk-feature/feature.xml 2012-07-03 11:29:46.997160156 +0200 @@ -71,32 +71,5 @@ diff --git a/eclipse-mylyn-merge-incubator.patch b/eclipse-mylyn-merge-incubator.patch index 69f0f0e..09514a4 100644 --- a/eclipse-mylyn-merge-incubator.patch +++ b/eclipse-mylyn-merge-incubator.patch @@ -20,7 +20,7 @@ - org.eclipse.mylyn.incubator + org.eclipse.mylyn.tasks-parent + org.eclipse.mylyn.tasks - 3.8.0-SNAPSHOT + 3.9.0-SNAPSHOT org.eclipse.mylyn.trac.wiki --- org.eclipse.mylyn.tasks/org.eclipse.mylyn.trac.wiki-feature/pom.xml.bak 2012-07-09 15:06:05.000000000 +0200 @@ -33,7 +33,7 @@ - org.eclipse.mylyn.incubator + org.eclipse.mylyn.tasks-parent + org.eclipse.mylyn.tasks - 3.8.0-SNAPSHOT + 3.9.0-SNAPSHOT org.eclipse.mylyn.trac.wiki_feature --- org.eclipse.mylyn.tasks/org.eclipse.mylyn.web.tasks/pom.xml.orig.bak 2012-07-09 15:23:30.000000000 +0200 @@ -46,7 +46,7 @@ - org.eclipse.mylyn.incubator + org.eclipse.mylyn.tasks-parent + org.eclipse.mylyn.tasks - 3.8.0-SNAPSHOT + 3.9.0-SNAPSHOT org.eclipse.mylyn.web.tasks --- org.eclipse.mylyn.tasks/org.eclipse.mylyn.web.tasks-feature/pom.xml.bak 2012-07-09 15:06:05.000000000 +0200 @@ -59,7 +59,7 @@ - org.eclipse.mylyn.incubator + org.eclipse.mylyn.tasks-parent + org.eclipse.mylyn.tasks - 3.8.0-SNAPSHOT + 3.9.0-SNAPSHOT org.eclipse.mylyn.web.tasks_feature --- org.eclipse.mylyn.tasks/org.eclipse.mylyn.web.tasks-feature/feature.xml.bak 2012-07-09 15:06:05.000000000 +0200 @@ -67,7 +67,7 @@ @@ -13,8 +13,7 @@ id="org.eclipse.mylyn.web.tasks_feature" label="%featureName" - version="3.8.0.qualifier" + version="3.9.0.qualifier" - provider-name="%providerName" - plugin="org.eclipse.mylyn.sandbox.ui"> + provider-name="%providerName"> @@ -79,7 +79,7 @@ @@ -13,8 +13,7 @@ id="org.eclipse.mylyn.trac.wiki_feature" label="%featureName" - version="3.8.0.qualifier" + version="3.9.0.qualifier" - provider-name="%providerName" - plugin="org.eclipse.mylyn.sandbox.ui"> + provider-name="%providerName"> diff --git a/eclipse-mylyn-tasks-remove-javax.patch b/eclipse-mylyn-tasks-remove-javax.patch index a8bdc9f..f868267 100644 --- a/eclipse-mylyn-tasks-remove-javax.patch +++ b/eclipse-mylyn-tasks-remove-javax.patch @@ -1,13 +1,13 @@ --- org.eclipse.mylyn.tasks/org.eclipse.mylyn.bugzilla-feature/feature.xml.bak 2012-03-16 10:42:08.000000000 +0100 +++ org.eclipse.mylyn.tasks/org.eclipse.mylyn.bugzilla-feature/feature.xml 2012-04-13 10:21:14.417113498 +0200 @@ -33,8 +33,6 @@ - + - - - + --- org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.sdk-feature/feature.xml.bak 2012-11-23 10:44:37.000000000 +0100 +++ org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.sdk-feature/feature.xml 2012-11-23 10:50:39.975642278 +0100 diff --git a/eclipse-mylyn.spec b/eclipse-mylyn.spec index 8495f86..8ddadee 100644 --- a/eclipse-mylyn.spec +++ b/eclipse-mylyn.spec @@ -1,17 +1,23 @@ +%{?scl:%scl_package eclipse-mylyn} +%{!?scl:%global pkg_name %{name}} + %global install_loc %{_datadir}/eclipse/dropins -%global tag 3_8_2 -%global incubator_tag 3_8_0 +%global tag f9e1cd2b2977e5ad9a0615b3b0f7740a5ac3eb1e +%global incubator_tag 77b5432b77c14b1317751eac67156805d00053bc %define __jar_repack 0 -Name: eclipse-mylyn +%{!?scl:%global _non_scl_javadir %{_javadir}} +%{?scl:%global _non_scl_javadir /usr/share/java} + +Name: %{?scl_prefix}eclipse-mylyn Summary: Eclipse Mylyn main feature. -Version: 3.8.2 -Release: 4%{?dist} +Version: 3.9.0 +Release: 0.1.gitf9e1cd%{?dist} License: EPL URL: http://www.eclipse.org/mylyn # bash fetch-eclipse-mylyn.sh -Source0: %{name}-R_%{tag}-fetched-src.tar.bz2 +Source0: %{pkg_name}-%{tag}-fetched-src.tar.bz2 Source1: fetch-eclipse-mylyn.sh Source2: org.eclipse.core.runtime.compatibility.auth.tar.bz2 @@ -20,23 +26,23 @@ Source4: eclipse-mylyn-compatibility-pom.xml Source6: redhat-bugzilla-custom-transitions.txt -Source7: eclipse-mylyn-R_%{incubator_tag}-incubator-fetched-src.tar.bz2 +Source7: eclipse-mylyn-%{incubator_tag}-incubator-fetched-src.tar.bz2 Source8: fetch-eclipse-mylyn-incubator.sh -Patch1: %{name}-hudson-feature-remove-unnecessary-imports.patch -Patch2: %{name}-hudson-core-to-java6.patch -Patch3: %{name}-remove-hudson-discovery.patch +Patch1: %{pkg_name}-hudson-feature-remove-unnecessary-imports.patch +Patch2: %{pkg_name}-hudson-core-to-java6.patch +Patch3: %{pkg_name}-remove-hudson-discovery.patch -Patch4: %{name}-remove-javax-activation.patch -Patch5: %{name}-tasks-remove-javax.patch -Patch6: %{name}-add-apache-xmlrpc.patch +Patch4: %{pkg_name}-remove-javax-activation.patch +Patch5: %{pkg_name}-tasks-remove-javax.patch +Patch6: %{pkg_name}-add-apache-xmlrpc.patch -Patch7: %{name}-ensure-sites-build-after-changes.patch -Patch8: %{name}-disable-online-tests.patch +Patch7: %{pkg_name}-ensure-sites-build-after-changes.patch +Patch8: %{pkg_name}-disable-online-tests.patch -Patch9: %{name}-build-compat.patch -Patch10: %{name}-adjust-lucene-version.patch -Patch11: %{name}-merge-incubator.patch +Patch9: %{pkg_name}-build-compat.patch +Patch10: %{pkg_name}-adjust-lucene-version.patch +Patch11: %{pkg_name}-merge-incubator.patch %if 0%{?rhel} >= 6 ExclusiveArch: %{ix86} x86_64 @@ -75,6 +81,7 @@ BuildRequires: apache-commons-discovery >= 0.5-2 BuildRequires: jacoco-maven-plugin BuildRequires: google-gson >= 2.0.0 BuildRequires: javamail >= 1.4.3-11 +BuildRequires: guava Requires: eclipse-platform >= 1:4.2.0 Requires: eclipse-rcp >= 1:4.2.0-0.6 @@ -94,6 +101,7 @@ Requires: apache-commons-discovery >= 0.5-2 Requires: jdom >= 1.1.2-3 Requires: javamail >= 1.4.3-11 Requires: lucene +%{?scl:Requires: %scl_runtime} Provides: %{name}-commons = %{version}-%{release} Obsoletes: %{name}-commons < %{version}-%{release} @@ -110,10 +118,10 @@ information that is not relevant to the current task. %package context-java Summary: Mylyn Bridge: Java Development -Requires: eclipse-jdt +Requires: %{?scl_prefix}eclipse-jdt Requires: %{name}-context = %{version}-%{release} -Provides: eclipse-mylyn-java = %{version}-%{release} -Obsoletes: eclipse-context-java < %{version}-%{release} +Provides: %{name}-java = %{version}-%{release} +%{!?scl:Obsoletes: eclipse-context-java < %{version}-%{release}} Group: Development/Tools %description context-java @@ -122,10 +130,10 @@ element views and editors. %package context-pde Summary: Mylyn Bridge: Plug-in Development -Requires: eclipse-pde +Requires: %{?scl_prefix}eclipse-pde Requires: %{name}-java = %{version}-%{release} -Provides: eclipse-mylyn-pde = %{version}-%{release} -Obsoletes: eclipse-context-pde < %{version}-%{release} +Provides: %{name}-pde = %{version}-%{release} +%{!?scl:Obsoletes: eclipse-context-pde < %{version}-%{release}} Group: Development/Tools %description context-pde @@ -134,12 +142,12 @@ Mylyn Task-Focused UI extensions for PDE, Ant, Team Support and CVS. %package context-cdt Summary: Mylyn Bridge: C/C++ Development Requires: %{name}-context = %{version}-%{release} -Requires: eclipse-cdt +Requires: %{?scl_prefix}eclipse-cdt Group: Development/Tools -Provides: eclipse-cdt-mylyn = 2:1.0.0-1.fc12 -Provides: eclipse-mylyn-cdt = %{version}-%{release} -Obsoletes: eclipse-context-cdt < %{version}-%{release} -Obsoletes: eclipse-cdt-mylyn < 2:1.0.0 +%{!?scl:Provides: eclipse-cdt-mylyn = 2:1.0.0-1.fc12} +Provides: %{name}-cdt = %{version}-%{release} +%{!?scl:Obsoletes: eclipse-context-cdt < %{version}-%{release}} +%{!?scl:Obsoletes: eclipse-cdt-mylyn < 2:1.0.0} %description context-cdt Mylyn Task-Focused UI extensions for CDT. Provides focusing of C/C++ @@ -166,9 +174,9 @@ Provides focusing of common IDE views and editors. %package tasks-bugzilla Summary: Mylyn Tasks Connector: Bugzilla -Requires: eclipse-platform >= 1:4.2.0 +Requires: %{?scl_prefix}eclipse-platform >= 1:4.2.0 Requires: %{name} = %{version}-%{release} -Provides: eclipse-mylyn-bugzilla = %{version}-%{release} +Provides: %{name}-bugzilla = %{version}-%{release} Group: Development/Tools %description tasks-bugzilla @@ -178,11 +186,11 @@ open source Bugzilla bug tracker. %package docs-wikitext Summary: Mylyn WikiText -Requires: eclipse-platform >= 1:3.8.0 +Requires: %{?scl_prefix}eclipse-platform >= 1:3.8.0 Requires: %{name} = %{version}-%{release} -Requires: eclipse-mylyn-context = %{version}-%{release} +Requires: %{name}-context = %{version}-%{release} Requires: jsoup -Provides: eclipse-mylyn-wikitext = %{version}-%{release} +Provides: %{name}-wikitext = %{version}-%{release} Group: Development/Tools %description docs-wikitext @@ -191,7 +199,7 @@ Enables parsing and display of lightweight markup (wiki text). %package docs-htmltext Summary: Mylyn HtmlText -Requires: eclipse-platform >= 1:3.8.0 +Requires: %{?scl_prefix}eclipse-platform >= 1:3.8.0 Group: Development/Tools %description docs-htmltext @@ -199,7 +207,7 @@ Enables editing of HTML text. %package docs-epub Summary: Mylyn EPub -Requires: eclipse-platform >= 1:3.8.0 +Requires: %{?scl_prefix}eclipse-platform >= 1:3.8.0 Group: Development/Tools %description docs-epub @@ -208,12 +216,12 @@ read and write EPUB formatted files. %package tasks-trac Summary: Mylyn Tasks Connector: Trac -Requires: eclipse-platform >= 1:4.2.0 -Requires: eclipse-mylyn = %{version}-%{release} -Requires: eclipse-mylyn-context = %{version}-%{release} +Requires: %{?scl_prefix}eclipse-platform >= 1:4.2.0 +Requires: %{name} = %{version}-%{release} +Requires: %{name}-context = %{version}-%{release} Requires: google-gson Group: Development/Tools -Provides: eclipse-mylyn-trac = %{version}-%{release} +Provides: %{name}-trac = %{version}-%{release} %description tasks-trac Provides Task List integration, offline support and rich editing @@ -221,7 +229,7 @@ for the open source Trac issue tracker. %package tasks-web Summary: Mylyn Tasks Connector: Web Templates (Advanced) (Incubation) -Requires: eclipse-platform >= 1:4.2.0 +Requires: %{?scl_prefix}eclipse-platform >= 1:4.2.0 Requires: %{name} = %{version}-%{release} Requires: rome >= 0.9-9 Requires: jdom >= 1.1.2-3 @@ -244,8 +252,8 @@ Provides a framework for accessing team providers for Eclipse Mylyn. %package versions-git Summary: Mylyn Versions Connector: Git -Requires: eclipse-platform >= 1:3.8.0 -Requires: eclipse-egit >= 0.10.1 +Requires: %{?scl_prefix}eclipse-platform >= 1:3.8.0 +Requires: %{?scl_prefix}eclipse-egit >= 0.10.1 Requires: %{name}-versions = %{version}-%{release} Group: Development/Tools @@ -254,7 +262,7 @@ Provides Git integration for Eclipse Mylyn. %package versions-cvs Summary: Mylyn Versions Connector: CVS -Requires: eclipse-platform >= 1:3.8.0 +Requires: %{?scl_prefix}eclipse-platform >= 1:3.8.0 Requires: %{name}-versions = %{version}-%{release} Group: Development/Tools @@ -263,9 +271,9 @@ Provides CVS integration for Eclipse Mylyn. %package versions-subclipse Summary: Mylyn Versions Connector: CVS -Requires: eclipse-platform >= 1:3.8.0 +Requires: %{?scl_prefix}eclipse-platform >= 1:3.8.0 Requires: %{name}-versions = %{version}-%{release} -Requires: eclipse-subclipse +Requires: %{?scl_prefix}eclipse-subclipse Group: Development/Tools %description versions-subclipse @@ -275,7 +283,7 @@ Provides CVS integration for Eclipse Mylyn. Summary: Eclipse Mylyn Builds Requires: %{name} = %{version}-%{release} Requires: %{name}-context = %{version}-%{release} -Requires: eclipse-emf +Requires: %{?scl_prefix}eclipse-emf Requires: %{name}-versions = %{version}-%{release} Requires: xml-commons-apis @@ -286,7 +294,7 @@ build providers using Eclipse Mylyn. %package builds-hudson Summary: Mylyn Builds Connector: Hudson/Jenkins Requires: java >= 1:1.7.0 -Requires: eclipse-platform >= 1:4.2.0-0.6 +Requires: %{?scl_prefix}eclipse-platform >= 1:4.2.0-0.6 Requires: %{name} = %{version}-%{release} Requires: ws-jaxme >= 0.5 Requires: google-gson >= 1.6.0 @@ -315,6 +323,7 @@ Requires: %{name}-versions-cvs = %{version}-%{release} Requires: %{name}-versions-subclipse = %{version}-%{release} Requires: %{name}-builds = %{version}-%{release} Requires: %{name}-builds-hudson = %{version}-%{release} +Requires: guava Group: Development/Tools %description sdk @@ -322,7 +331,7 @@ Sources for all Mylyn bundles %prep -%setup -q -n eclipse-mylyn-R_%{tag}-fetched-src +%setup -q -n eclipse-mylyn-%{tag}-fetched-src tar xjf %{SOURCE2} -C org.eclipse.mylyn.commons cp %{SOURCE4} org.eclipse.mylyn.commons/org.eclipse.core.runtime.compatibility.auth/pom.xml tar xjf %{SOURCE7} -C org.eclipse.mylyn.tasks --strip-components=1 @@ -368,24 +377,25 @@ grep -l -r --include="pom.xml" "tests" . | ( while read pom_path; do echo `%pom_ mkdir -p orbitDeps/plugins pushd orbitDeps/plugins -ln -s %{_javadir}/javamail/mail.jar -ln -s %{_javadir}/jsoup.jar -ln -s %{_javadir}/jdom.jar -ln -s %{_javadir}/rome*.jar -ln -s %{_javadir}/apache-commons-lang.jar -ln -s %{_javadir}/httpcomponents/httpcore.jar -ln -s %{_javadir}/httpcomponents/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}/xmlrpc-client.jar -ln -s %{_javadir}/xmlrpc-common.jar -ln -s %{_javadir}/ws-commons-util.jar -ln -s %{_javadir}/jaxme/jaxmeapi.jar -ln -s %{_javadir}/jaxp.jar -ln -s %{_javadir}/google-gson.jar -ln -s %{_javadir}/axis/axis.jar -ln -s %{_javadir}/axis/jaxrpc.jar +ln -s %{_non_scl_javadir}/javamail/mail.jar +ln -s %{_non_scl_javadir}/jsoup.jar +ln -s %{_non_scl_javadir}/jdom.jar +ln -s %{_non_scl_javadir}/rome*.jar +ln -s %{_non_scl_javadir}/apache-commons-lang.jar +ln -s %{_non_scl_javadir}/httpcomponents/httpcore.jar +ln -s %{_non_scl_javadir}/httpcomponents/httpclient.jar +ln -s %{_non_scl_javadir}/apache-commons-io.jar +ln -s %{_non_scl_javadir}/apache-commons-logging-api.jar +ln -s %{_non_scl_javadir}/apache-commons-discovery.jar +ln -s %{_non_scl_javadir}/xmlrpc-client.jar +ln -s %{_non_scl_javadir}/xmlrpc-common.jar +ln -s %{_non_scl_javadir}/ws-commons-util.jar +ln -s %{_non_scl_javadir}/jaxme/jaxmeapi.jar +ln -s %{_non_scl_javadir}/jaxp.jar +ln -s %{_non_scl_javadir}/google-gson.jar +ln -s %{_non_scl_javadir}/axis/axis.jar +ln -s %{_non_scl_javadir}/axis/jaxrpc.jar +ln -s %{_non_scl_javadir}/guava.jar popd eclipse -debug -consolelog -nosplash -verbose \ @@ -404,6 +414,7 @@ sed -i -e '0,/3.8.0/s/3.8.0/3.8.2/' org.eclipse.mylyn.tasks/org.eclipse.mylyn.we sed -i -e '0,/3.8.0/s/3.8.0/3.8.2/' org.eclipse.mylyn.tasks/org.eclipse.mylyn.web.tasks-feature/pom.xml %build +%{?scl:%scl_maven_opts} mvn-rpmbuild clean install -Dmaven.test.skip=true -DskipTychoVersionCheck #-DforceContextQualifier=v20120612-0600 @@ -437,25 +448,28 @@ rm org.apache.ws.commons.util_*.jar rm org.apache.xmlrpc_*.jar rm org.jdom_*.jar rm org.jsoup_*.jar -ln -s %{_javadir}/jsoup.jar -ln -s %{_javadir}/jdom.jar -ln -s %{_javadir}/rome*.jar -ln -s %{_javadir}/apache-commons-lang.jar -ln -s %{_javadir}/httpcomponents/httpcore.jar -ln -s %{_javadir}/httpcomponents/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}/xmlrpc-client.jar -ln -s %{_javadir}/xmlrpc-common.jar -ln -s %{_javadir}/ws-commons-util.jar -ln -s %{_javadir}/jaxme/jaxmeapi.jar -ln -s %{_javadir}/jaxp.jar -ln -s %{_javadir}/google-gson.jar -ln -s %{_javadir}/axis/axis.jar -ln -s %{_javadir}/axis/jaxrpc.jar -ln -s %{_javadir}/axis/saaj.jar -ln -s %{_javadir}/javamail/mail.jar +rm com.google.guava_*.jar + +ln -s %{_non_scl_javadir}/jsoup.jar +ln -s %{_non_scl_javadir}/jdom.jar +ln -s %{_non_scl_javadir}/rome*.jar +ln -s %{_non_scl_javadir}/apache-commons-lang.jar +ln -s %{_non_scl_javadir}/httpcomponents/httpcore.jar +ln -s %{_non_scl_javadir}/httpcomponents/httpclient.jar +ln -s %{_non_scl_javadir}/apache-commons-io.jar +ln -s %{_non_scl_javadir}/apache-commons-logging-api.jar +ln -s %{_non_scl_javadir}/apache-commons-discovery.jar +ln -s %{_non_scl_javadir}/xmlrpc-client.jar +ln -s %{_non_scl_javadir}/xmlrpc-common.jar +ln -s %{_non_scl_javadir}/ws-commons-util.jar +ln -s %{_non_scl_javadir}/jaxme/jaxmeapi.jar +ln -s %{_non_scl_javadir}/jaxp.jar +ln -s %{_non_scl_javadir}/google-gson.jar +ln -s %{_non_scl_javadir}/axis/axis.jar +ln -s %{_non_scl_javadir}/axis/jaxrpc.jar +ln -s %{_non_scl_javadir}/axis/saaj.jar +ln -s %{_non_scl_javadir}/javamail/mail.jar +ln -s %{_non_scl_javadir}/guava.jar popd mkdir -p %{buildroot}%{install_loc}/mylyn/eclipse/features @@ -538,6 +552,7 @@ install %{SOURCE6} %{buildroot}%{install_loc}/mylyn/eclipse/redhat-bugzilla-cust %{install_loc}/mylyn/eclipse/plugins/jaxrpc.jar %{install_loc}/mylyn/eclipse/plugins/saaj.jar %{install_loc}/mylyn/eclipse/plugins/mail.jar +%{install_loc}/mylyn/eclipse/plugins/guava.jar %doc org.eclipse.mylyn.tasks/org.eclipse.mylyn-feature/epl-v10.html %doc org.eclipse.mylyn.tasks/org.eclipse.mylyn-feature/license.html @@ -547,6 +562,7 @@ install %{SOURCE6} %{buildroot}%{install_loc}/mylyn/eclipse/redhat-bugzilla-cust %{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.java.tasks_*.jar %{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.ide.ui_*.jar %{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.ide.ant_*.jar +%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.debug.ui_*.jar %doc org.eclipse.mylyn.context/org.eclipse.mylyn.java-feature/epl-v10.html %doc org.eclipse.mylyn.context/org.eclipse.mylyn.java-feature/license.html @@ -690,10 +706,15 @@ install %{SOURCE6} %{buildroot}%{install_loc}/mylyn/eclipse/redhat-bugzilla-cust %{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.tests.util_*.jar %{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.*.source_*.jar %{install_loc}/mylyn/eclipse/plugins/org.eclipse.cdt.mylyn.ui.source_*.jar +%{install_loc}/mylyn/eclipse/plugins/guava.jar %doc org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.sdk-feature/epl-v10.html %doc org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.sdk-feature/license.html %changelog +* Fri Mar 1 2013 Krzysztof Daniel 3.9.0-0.1.gitf9e1cd +- Update to latest upstream. +- Initial SCLization. + * Wed Feb 13 2013 Fedora Release Engineering - 3.8.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild diff --git a/fetch-eclipse-mylyn-incubator.sh b/fetch-eclipse-mylyn-incubator.sh index 75c92db..a39fa44 100755 --- a/fetch-eclipse-mylyn-incubator.sh +++ b/fetch-eclipse-mylyn-incubator.sh @@ -2,7 +2,7 @@ set -e -RELEASE_TAG="R_3_8_0" +RELEASE_TAG="77b5432b77c14b1317751eac67156805d00053bc" FETCHED_SOURCES_NAME="eclipse-mylyn-${RELEASE_TAG}-incubator-fetched-src" #clean up old runs diff --git a/fetch-eclipse-mylyn.sh b/fetch-eclipse-mylyn.sh index 5ea2812..bb5c847 100755 --- a/fetch-eclipse-mylyn.sh +++ b/fetch-eclipse-mylyn.sh @@ -2,7 +2,7 @@ set -e -RELEASE_TAG="R_3_8_2" +RELEASE_TAG="f9e1cd2b2977e5ad9a0615b3b0f7740a5ac3eb1e" FETCHED_SOURCES_NAME="eclipse-mylyn-${RELEASE_TAG}-fetched-src" #clean up old runs @@ -11,8 +11,10 @@ rm -rf $FETCHED_SOURCES_NAME rm -rf $RELEASE_TAG #checkout -git clone -b $RELEASE_TAG --recursive git://git.eclipse.org/gitroot/mylyn/org.eclipse.mylyn.all.git $RELEASE_TAG +git clone --recursive git://git.eclipse.org/gitroot/mylyn/org.eclipse.mylyn.all.git $RELEASE_TAG cd $RELEASE_TAG +git checkout $RELEASE_TAG +git submodule update #remove precomipled binaries find . -type f -name ".class" -exec rm {} \; diff --git a/sources b/sources index 8ffcdf0..575a4c4 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -382e94f38133fad797ed8aa6429fa45f eclipse-mylyn-R_3_8_0-incubator-fetched-src.tar.bz2 -176e4fb15131a5071a2416c7878b276a eclipse-mylyn-R_3_8_2-fetched-src.tar.bz2 +adc7bdaa9764db70896b2d207d8c8cb3 eclipse-mylyn-77b5432b77c14b1317751eac67156805d00053bc-incubator-fetched-src.tar.bz2 +8cb62069b84cae4c0ba5c9cc1464aacb eclipse-mylyn-f9e1cd2b2977e5ad9a0615b3b0f7740a5ac3eb1e-fetched-src.tar.bz2 cf614787f054377d9cb9a18722b0c408 org.eclipse.core.runtime.compatibility.auth.tar.bz2