[eclipse-mylyn] Update to 3.14.
Alexander Kurtakov
akurtakov at fedoraproject.org
Mon Jan 12 13:15:12 UTC 2015
commit 04217213d6f7c7900e40383ca58e1ecd02463260
Author: Alexander Kurtakov <akurtako at redhat.com>
Date: Mon Jan 12 15:15:27 2015 +0200
Update to 3.14.
eclipse-mylyn-disable-online-tests.patch | 28 ----------------------------
eclipse-mylyn.spec | 12 ++++++++----
fetch-eclipse-mylyn.sh | 2 +-
sources | 2 +-
4 files changed, 10 insertions(+), 34 deletions(-)
---
diff --git a/eclipse-mylyn-disable-online-tests.patch b/eclipse-mylyn-disable-online-tests.patch
index 57ff551..ddd9bcf 100644
--- a/eclipse-mylyn-disable-online-tests.patch
+++ b/eclipse-mylyn-disable-online-tests.patch
@@ -1,31 +1,3 @@
---- org.eclipse.mylyn.docs/org.eclipse.mylyn.docs.epub.tests/pom.xml.bak 2012-07-02 09:22:28.000000000 +0200
-+++ org.eclipse.mylyn.docs/org.eclipse.mylyn.docs.epub.tests/pom.xml 2012-07-05 12:59:13.696588682 +0200
-@@ -17,25 +17,6 @@
- <build>
- <plugins>
- <plugin>
-- <groupId>org.apache.maven.plugins</groupId>
-- <artifactId>maven-antrun-plugin</artifactId>
-- <version>1.6</version>
-- <executions>
-- <execution>
-- <id>epubcheck</id>
-- <phase>generate-sources</phase>
-- <configuration>
-- <tasks>
-- <ant antfile="epubcheck.xml" inheritAll="true"/>
-- </tasks>
-- </configuration>
-- <goals>
-- <goal>run</goal>
-- </goals>
-- </execution>
-- </executions>
-- </plugin>
-- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-surefire-plugin</artifactId>
- <version>${tycho-version}</version>
--- org.eclipse.mylyn.docs/org.eclipse.mylyn.wikitext.sdk-feature/feature.xml.sav 2014-10-02 14:56:02.949731472 +0100
+++ org.eclipse.mylyn.docs/org.eclipse.mylyn.wikitext.sdk-feature/feature.xml 2014-10-02 14:57:18.248690683 +0100
@@ -49,13 +49,6 @@
diff --git a/eclipse-mylyn.spec b/eclipse-mylyn.spec
index c6c2049..0fe79d3 100644
--- a/eclipse-mylyn.spec
+++ b/eclipse-mylyn.spec
@@ -2,7 +2,7 @@
%{!?scl:%global pkg_name %{name}}
%global install_loc %{_datadir}/eclipse/dropins
-%global tag R_3_13_0
+%global tag R_3_14_0
%global incubator_tag af9c0aaf3a4e28ced4a09e0a5e09d80dd5933a4b
%{!?scl:%global _non_scl_javadir %{_javadir}}
@@ -10,8 +10,8 @@
Name: %{?scl_prefix}eclipse-mylyn
Summary: Eclipse Mylyn main feature.
-Version: 3.13.0
-Release: 2%{?dist}
+Version: 3.14.0
+Release: 1%{?dist}
License: EPL
URL: http://www.eclipse.org/mylyn
@@ -294,7 +294,6 @@ tar xaf %{SOURCE7} -C org.eclipse.mylyn.tasks --strip-components=1
pushd org.eclipse.mylyn.tasks
%patch6 -p1 -b .sav
popd
-%patch7 -p1
%patch8
#Disable plugins we can live without and for some reason are redundant (unpackaged or causing build failures).
@@ -366,6 +365,8 @@ sed -i -e "s/JavaSE-1.6/JavaSE-1.8/g" org.eclipse.mylyn.tasks/org.eclipse.mylyn.
#Disable pack-and-sign/build.xml
%pom_remove_plugin org.apache.maven.plugins:maven-antrun-plugin org.eclipse.mylyn/org.eclipse.mylyn-site
+sed -i -e "s|@NonNull||g" org.eclipse.mylyn.tasks/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.core/src/org/eclipse/mylyn/internal/bugzilla/rest/core/RepositoryKey.java
+
%build
export MAVEN_OPTS="-XX:CompileCommand=exclude,org/eclipse/tycho/core/osgitools/EquinoxResolver,newState ${MAVEN_OPTS}"
xmvn -o clean verify -Ddist.qualifier="'v'yyyyMMdd-HHmm" -Dmaven.test.skip=true
@@ -645,6 +646,9 @@ set -e
%{_javadir}/mylyn-tests
%changelog
+* Mon Jan 12 2015 Alexander Kurtakov <akurtako at redhat.com> 3.14.0-1
+- Update to 3.14.
+
* Thu Nov 13 2014 Alexander Kurtakov <akurtako at redhat.com> 3.13.0-2
- Update lucene4 patch to work properly.
diff --git a/fetch-eclipse-mylyn.sh b/fetch-eclipse-mylyn.sh
index 1a2a81c..86dd705 100755
--- a/fetch-eclipse-mylyn.sh
+++ b/fetch-eclipse-mylyn.sh
@@ -2,7 +2,7 @@
set -e
-RELEASE_TAG="R_3_13_0"
+RELEASE_TAG="R_3_14_0"
FETCHED_SOURCES_NAME="eclipse-mylyn-${RELEASE_TAG}-fetched-src"
#clean up old runs
diff --git a/sources b/sources
index 1945a7e..38d2e2e 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
3f4441cd26c55c1875b43b993cb2a670 eclipse-mylyn-af9c0aaf3a4e28ced4a09e0a5e09d80dd5933a4b-incubator-fetched-src.tar.xz
-9cb6ddf768f5dd623332aed11aeecbd7 eclipse-mylyn-R_3_13_0-fetched-src.tar.xz
+5825e91955cb0e1442fc260da8c64a37 eclipse-mylyn-R_3_14_0-fetched-src.tar.xz
More information about the scm-commits
mailing list