commit 9c1731a8bb59a380e59f2b469fe813e04e16e8e8
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Thu Feb 19 17:57:48 2015 +0200
Update to upstream 3.14.2 release.
eclipse-mylyn-merge-incubator.patch | 4 +-
eclipse-mylyn-remove-epubcheck-tests.patch | 2072 ----------------------------
eclipse-mylyn.spec | 34 +-
fetch-eclipse-mylyn-incubator.sh | 2 +-
fetch-eclipse-mylyn.sh | 2 +-
sources | 4 +-
6 files changed, 24 insertions(+), 2094 deletions(-)
---
diff --git a/eclipse-mylyn-merge-incubator.patch b/eclipse-mylyn-merge-incubator.patch
index 418af65..ead7f4d 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.13.0.qualifier"
+ version="3.14.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.13.0.qualifier"
+ version="3.14.0.qualifier"
- provider-name="%providerName"
- plugin="org.eclipse.mylyn.sandbox.ui">
+ provider-name="%providerName">
diff --git a/eclipse-mylyn.spec b/eclipse-mylyn.spec
index bb5deda..b6c8a08 100644
--- a/eclipse-mylyn.spec
+++ b/eclipse-mylyn.spec
@@ -1,10 +1,10 @@
-%global tag R_3_14_0
-%global incubator_tag af9c0aaf3a4e28ced4a09e0a5e09d80dd5933a4b
+%global tag R_3_14_2
+%global incubator_tag e963896478edf4fb7b4474895b15c6359aaa9a17
Name: eclipse-mylyn
Summary: Eclipse Mylyn main feature.
-Version: 3.14.0
-Release: 3%{?dist}
+Version: 3.14.2
+Release: 1%{?dist}
License: EPL
URL:
http://www.eclipse.org/mylyn
@@ -17,13 +17,12 @@ Source8: fetch-eclipse-mylyn-incubator.sh
Patch0: %{name}-remove-hudson-discovery.patch
Patch1: %{name}-add-apache-xmlrpc.patch
-Patch3: %{name}-disable-online-tests.patch
-Patch4: %{name}-merge-incubator.patch
-Patch5: %{name}-bug-419133.patch
-Patch6: lucene4.patch
-Patch7: %{name}-remove-epubcheck-tests.patch
-Patch8: %{name}-remove-nullable-annotation.patch
-Patch9: explicit-hamcrest-use.patch
+Patch2: %{name}-disable-online-tests.patch
+Patch3: %{name}-merge-incubator.patch
+Patch4: %{name}-bug-419133.patch
+Patch5: lucene4.patch
+Patch6: %{name}-remove-nullable-annotation.patch
+Patch7: explicit-hamcrest-use.patch
BuildArch: noarch
@@ -204,14 +203,14 @@ tar xaf %{SOURCE7} -C org.eclipse.mylyn.tasks --strip-components=1
%patch0
%patch1
+%patch2 -b .sav
%patch3 -b .sav
-%patch4 -b .sav
-%patch5
+%patch4
pushd org.eclipse.mylyn.tasks
-%patch6 -p1 -b .sav
+%patch5 -p1 -b .sav
popd
-%patch8
-%patch9
+%patch6
+%patch7
# Disable plugins we can live without (they are skipped by default anyway)
for p in findbugs-maven-plugin maven-pmd-plugin jacoco-maven-plugin ; do
@@ -332,6 +331,9 @@ install %{SOURCE6} \
%files tests -f .mfiles-tests
%changelog
+* Thu Feb 19 2015 Alexander Kurtakov <akurtako(a)redhat.com> 3.14.2-1
+- Update to upstream 3.14.2.
+
* Thu Feb 5 2015 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 3.14.0-3
- Rebuild to fix auto-requires
diff --git a/fetch-eclipse-mylyn-incubator.sh b/fetch-eclipse-mylyn-incubator.sh
index bf54846..cee783b 100755
--- a/fetch-eclipse-mylyn-incubator.sh
+++ b/fetch-eclipse-mylyn-incubator.sh
@@ -2,7 +2,7 @@
set -e
-RELEASE_TAG="af9c0aaf3a4e28ced4a09e0a5e09d80dd5933a4b"
+RELEASE_TAG="e963896478edf4fb7b4474895b15c6359aaa9a17"
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 86dd705..b457636 100755
--- a/fetch-eclipse-mylyn.sh
+++ b/fetch-eclipse-mylyn.sh
@@ -2,7 +2,7 @@
set -e
-RELEASE_TAG="R_3_14_0"
+RELEASE_TAG="R_3_14_2"
FETCHED_SOURCES_NAME="eclipse-mylyn-${RELEASE_TAG}-fetched-src"
#clean up old runs
diff --git a/sources b/sources
index 38d2e2e..53f064f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-3f4441cd26c55c1875b43b993cb2a670
eclipse-mylyn-af9c0aaf3a4e28ced4a09e0a5e09d80dd5933a4b-incubator-fetched-src.tar.xz
-5825e91955cb0e1442fc260da8c64a37 eclipse-mylyn-R_3_14_0-fetched-src.tar.xz
+09dbe06a20507620fa1a0e5c2535b9be eclipse-mylyn-R_3_14_2-fetched-src.tar.xz
+464f25c33cb15af8e45ae707d7a609f1
eclipse-mylyn-e963896478edf4fb7b4474895b15c6359aaa9a17-incubator-fetched-src.tar.xz