From f105a74971827b3984cc6ebd2f777e6dea4a135d Mon Sep 17 00:00:00 2001 From: Sopot Cela Date: Aug 03 2016 11:56:08 +0000 Subject: Upgrade to upstream release 3.20.2 --- diff --git a/0001-Compile-with-Lucene-5.patch b/0001-Compile-with-Lucene-5.patch index 5715956..d31544b 100644 --- a/0001-Compile-with-Lucene-5.patch +++ b/0001-Compile-with-Lucene-5.patch @@ -22,7 +22,7 @@ index 2a3b1f8..78c5cfa 100644 + org.apache.lucene.core;bundle-version="[5.0.0,6.0.0)", + org.apache.lucene.queryparser;bundle-version="[5.0.0,6.0.0)", + org.apache.lucene.analyzers-common;bundle-version="[5.0.0,6.0.0)" - Bundle-RequiredExecutionEnvironment: JavaSE-1.7 + Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.mylyn.internal.tasks.index.core;x-internal:=true diff --git a/org.eclipse.mylyn.tasks.index.core/src/org/eclipse/mylyn/internal/tasks/index/core/TaskAnalyzer.java b/org.eclipse.mylyn.tasks.index.core/src/org/eclipse/mylyn/internal/tasks/index/core/TaskAnalyzer.java diff --git a/eclipse-mylyn-add-apache-xmlrpc.patch b/eclipse-mylyn-add-apache-xmlrpc.patch index bf7c422..7369678 100644 --- a/eclipse-mylyn-add-apache-xmlrpc.patch +++ b/eclipse-mylyn-add-apache-xmlrpc.patch @@ -9,7 +9,7 @@ + org.apache.xmlrpc.common Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.mylyn.internal.commons.xmlrpc;x-internal:=true - Bundle-RequiredExecutionEnvironment: JavaSE-1.7 + Bundle-RequiredExecutionEnvironment: JavaSE-1.8 --- org.eclipse.mylyn.tasks/org.eclipse.mylyn.bugzilla.core/META-INF/MANIFEST.MF.bak 2012-07-03 14:20:13.726607170 +0200 +++ org.eclipse.mylyn.tasks/org.eclipse.mylyn.bugzilla.core/META-INF/MANIFEST.MF 2012-07-03 14:20:25.813672358 +0200 @@ -10,7 +10,8 @@ diff --git a/eclipse-mylyn-bree-bump.patch b/eclipse-mylyn-bree-bump.patch deleted file mode 100644 index 0f65a3a..0000000 --- a/eclipse-mylyn-bree-bump.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.core/META-INF/MANIFEST.MF b/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.core/META-INF/MANIFEST.MF -index 5ff8abc..18f9bc8 100644 ---- a/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.core/META-INF/MANIFEST.MF -+++ b/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.core/META-INF/MANIFEST.MF -@@ -14,7 +14,7 @@ - org.eclipse.equinox.security, - com.google.guava, - org.apache.commons.io --Bundle-RequiredExecutionEnvironment: JavaSE-1.7 -+Bundle-RequiredExecutionEnvironment: JavaSE-1.8 - Bundle-ActivationPolicy: lazy - Export-Package: org.eclipse.mylyn.internal.bugzilla.rest.core, - org.eclipse.mylyn.internal.bugzilla.rest.core.response.data diff --git a/eclipse-mylyn-merge-incubator.patch b/eclipse-mylyn-merge-incubator.patch index 86177d2..e58a2e9 100644 --- a/eclipse-mylyn-merge-incubator.patch +++ b/eclipse-mylyn-merge-incubator.patch @@ -3,7 +3,7 @@ @@ -13,8 +13,7 @@ id="org.eclipse.mylyn.web.tasks_feature" label="%featureName" - version="3.19.0.qualifier" + version="3.20.0.qualifier" - provider-name="%providerName" - plugin="org.eclipse.mylyn.sandbox.ui"> + provider-name="%providerName"> @@ -15,7 +15,7 @@ @@ -13,8 +13,7 @@ id="org.eclipse.mylyn.trac.wiki_feature" label="%featureName" - version="3.19.0.qualifier" + version="3.20.0.qualifier" - provider-name="%providerName" - plugin="org.eclipse.mylyn.sandbox.ui"> + provider-name="%providerName"> diff --git a/eclipse-mylyn-remove-hudson-discovery.patch b/eclipse-mylyn-remove-hudson-discovery.patch index bb995b0..c576ada 100644 --- a/eclipse-mylyn-remove-hudson-discovery.patch +++ b/eclipse-mylyn-remove-hudson-discovery.patch @@ -4,7 +4,7 @@ index dc4a512..ab101b8 100644 +++ org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.ui/META-INF/MANIFEST.MF @@ -20,5 +20,4 @@ Require-Bundle: org.eclipse.core.runtime, Bundle-ActivationPolicy: lazy - Bundle-RequiredExecutionEnvironment: JavaSE-1.7 + Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Localization: plugin -Export-Package: org.eclipse.mylyn.internal.hudson.ui;x-internal:=true -Bundle-Activator: org.eclipse.mylyn.internal.hudson.ui.HudsonUiPlugin diff --git a/eclipse-mylyn-remove-nullable-annotation.patch b/eclipse-mylyn-remove-nullable-annotation.patch deleted file mode 100644 index 19f34fe..0000000 --- a/eclipse-mylyn-remove-nullable-annotation.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git org.eclipse.mylyn.tasks/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskInitializationData.java org.eclipse.mylyn.tasks/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskInitializationData.java -index 39c3f1f..5bc9214 100644 ---- org.eclipse.mylyn.tasks/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskInitializationData.java -+++ org.eclipse.mylyn.tasks/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskInitializationData.java -@@ -191,7 +191,6 @@ public class TaskInitializationData implements ITaskMapping { - /** - * Throws {@link UnsupportedOperationException}. - */ -- @Nullable - public void merge(ITaskMapping source) { - throw new UnsupportedOperationException(); - } -@@ -248,4 +247,4 @@ public class TaskInitializationData implements ITaskMapping { - attributesById.setAttribute(TaskAttribute.VERSION, version); - } - --} -\ No newline at end of file -+} diff --git a/eclipse-mylyn.spec b/eclipse-mylyn.spec index 1a36f09..b4e8d8d 100644 --- a/eclipse-mylyn.spec +++ b/eclipse-mylyn.spec @@ -1,5 +1,5 @@ -%global tag R_3_19_0 -%global incubator_tag 4c800cb4e89aab31590a96fe961d56464d54383b +%global tag e_4_5_m_3_20_x +%global incubator_tag e9e79d9d73ec879d0db2b909014e6e1dce7ab806 %if 0%{?fedora} >= 24 %global droplets droplets @@ -9,8 +9,8 @@ Name: eclipse-mylyn Summary: Eclipse Mylyn main feature. -Version: 3.19.0 -Release: 4%{?dist} +Version: 3.20.2 +Release: 1%{?dist} License: EPL URL: http://www.eclipse.org/mylyn @@ -31,10 +31,8 @@ Patch5: lucene4.patch %else Patch5: 0001-Compile-with-Lucene-5.patch %endif -Patch6: %{name}-remove-nullable-annotation.patch Patch7: explicit-hamcrest-use.patch -Patch8: %{name}-bree-bump.patch -%if 0%{?fedora} == 25 +%if 0%{?fedora} >= 25 Patch10: rome.patch %endif BuildArch: noarch @@ -58,7 +56,7 @@ BuildRequires: ws-commons-util >= 1.0.1-21 BuildRequires: xmlrpc-client >= 3.1.3 BuildRequires: xmlrpc-common >= 3.1.3 BuildRequires: xmlrpc-server >= 3.1.3 -%if 0%{?fedora} == 25 +%if 0%{?fedora} >= 25 BuildRequires: rome >= 1.6 %else BuildRequires: rome >= 0.9-9 @@ -79,7 +77,7 @@ BuildRequires: xml-maven-plugin BuildRequires: tika BuildRequires: tika-parsers BuildRequires: jsoup -%if 0%{?fedora} == 25 +%if 0%{?fedora} >= 25 BuildRequires: jdom BuildRequires: jdom2 %endif @@ -236,13 +234,8 @@ tar xaf %{SOURCE7} -C org.eclipse.mylyn.tasks --strip-components=1 pushd org.eclipse.mylyn.tasks %patch5 -p1 -b .sav popd -%patch6 %patch7 -pushd org.eclipse.mylyn.tasks -%patch8 -p1 -popd - -%if 0%{?fedora} == 25 +%if 0%{?fedora} >= 25 pushd org.eclipse.mylyn.tasks %patch10 -p1 popd @@ -298,6 +291,8 @@ sed -i -e "s@false<@true<@" org.eclipse. %pom_set_parent org.eclipse.mylyn.tasks:org.eclipse.mylyn.tasks-parent:%{version}-SNAPSHOT org.eclipse.mylyn.tasks/org.eclipse.mylyn.trac.wiki-feature/pom.xml %pom_set_parent org.eclipse.mylyn.tasks:org.eclipse.mylyn.tasks-parent:%{version}-SNAPSHOT org.eclipse.mylyn.tasks/org.eclipse.mylyn.web.tasks/pom.xml %pom_set_parent org.eclipse.mylyn.tasks:org.eclipse.mylyn.tasks-parent:%{version}-SNAPSHOT org.eclipse.mylyn.tasks/org.eclipse.mylyn.web.tasks-feature/pom.xml +%pom_xpath_set pom:parent/pom:version "%{version}-SNAPSHOT" org.eclipse.mylyn.versions/pom.xml +%pom_xpath_set pom:parent/pom:version "%{version}-SNAPSHOT" org.eclipse.mylyn.docs/pom.xml rm org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.ui/src/org/eclipse/mylyn/internal/hudson/ui/HudsonStartup.java @@ -397,6 +392,9 @@ install %{SOURCE6} \ %files tests -f .mfiles-tests %changelog +* Wed Aug 03 2016 Sopot Cela - 3.20.2-1 +- Upgrade to 3.20.2 + * Wed Jun 15 2016 Mikolaj Izdebski - 3.19.0-4 - Add missing build-requires diff --git a/explicit-hamcrest-use.patch b/explicit-hamcrest-use.patch index fc7abc3..70802e8 100644 --- a/explicit-hamcrest-use.patch +++ b/explicit-hamcrest-use.patch @@ -2,7 +2,7 @@ +++ org.eclipse.mylyn.tasks/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.core.tests/META-INF/MANIFEST.MF 2015-01-29 14:14:28.583954615 +0000 @@ -7,8 +7,8 @@ Fragment-Host: org.eclipse.mylyn.bugzilla.rest.core - Bundle-RequiredExecutionEnvironment: JavaSE-1.7 + Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.junit;bundle-version="4.8.2", - org.hamcrest;bundle-version="[1.0.0,1.2.0)", - org.hamcrest.library;bundle-version="[1.0.0,1.2.0)", @@ -15,7 +15,7 @@ +++ org.eclipse.mylyn.tasks/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.tests/META-INF/MANIFEST.MF 2015-01-29 15:01:05.218570917 +0000 @@ -6,6 +6,7 @@ Bundle-Vendor: Eclipse Mylyn - Bundle-RequiredExecutionEnvironment: JavaSE-1.7 + Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.junit;bundle-version="4.8.2", + org.hamcrest.core, org.eclipse.equinox.common, diff --git a/fetch-eclipse-mylyn-incubator.sh b/fetch-eclipse-mylyn-incubator.sh index 0f22cc9..3b1414a 100755 --- a/fetch-eclipse-mylyn-incubator.sh +++ b/fetch-eclipse-mylyn-incubator.sh @@ -2,7 +2,7 @@ set -e -RELEASE_TAG="4c800cb4e89aab31590a96fe961d56464d54383b" +RELEASE_TAG="e9e79d9d73ec879d0db2b909014e6e1dce7ab806" 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 d682f9f..03b542a 100755 --- a/fetch-eclipse-mylyn.sh +++ b/fetch-eclipse-mylyn.sh @@ -2,7 +2,7 @@ set -e -RELEASE_TAG="R_3_19_0" +RELEASE_TAG="e_4_5_m_3_20_x" FETCHED_SOURCES_NAME="eclipse-mylyn-${RELEASE_TAG}-fetched-src" #clean up old runs diff --git a/rome.patch b/rome.patch index 3f7685d..f6c2178 100644 --- a/rome.patch +++ b/rome.patch @@ -9,7 +9,7 @@ index 97c08ac..172a119 100644 --- a/org.eclipse.mylyn.web.tasks/META-INF/MANIFEST.MF +++ b/org.eclipse.mylyn.web.tasks/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.mylyn.web.tasks;singleton:=true - Bundle-Version: 3.19.0.qualifier + Bundle-Version: 3.20.0.qualifier Bundle-Activator: org.eclipse.mylyn.internal.web.tasks.TasksWebPlugin Bundle-Vendor: %Bundle-Vendor -Require-Bundle: com.sun.syndication;bundle-version="0.9.0", diff --git a/sources b/sources index 0c70b7d..4cae1e2 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -b6504333500564d5a21f5e3cab99ecb7 eclipse-mylyn-4c800cb4e89aab31590a96fe961d56464d54383b-incubator-fetched-src.tar.xz -04bc67e22dbcb8a8efd57ef1760d2bd5 eclipse-mylyn-R_3_19_0-fetched-src.tar.xz +e6aca1154a551050cbfed841c34c45bc eclipse-mylyn-e_4_5_m_3_20_x-fetched-src.tar.xz +e5a3171525d165471215b300a44e84fd eclipse-mylyn-e9e79d9d73ec879d0db2b909014e6e1dce7ab806-incubator-fetched-src.tar.xz