[eclipse-mylyn] Update to R_3_12_0 tag.

swagiaal swagiaal at fedoraproject.org
Thu Jul 10 20:02:23 UTC 2014 

commit 0d282ccd696ad51ac06e00e49eceed519a6271c7
Author: Sami Wagiaalla <swagiaal at redhat.com>
Date:   Thu Jul 10 15:07:36 2014 -0400

    Update to R_3_12_0 tag.

 eclipse-mylyn-remove-hudson-discovery.patch    |  240 +++++++++++++-----------
 eclipse-mylyn-remove-nullable-annotation.patch |   19 ++
 eclipse-mylyn.spec                             |   52 +----
 fetch-eclipse-mylyn.sh                         |    2 +-
 4 files changed, 165 insertions(+), 148 deletions(-)
---
diff --git a/eclipse-mylyn-remove-hudson-discovery.patch b/eclipse-mylyn-remove-hudson-discovery.patch
index de1ab5e..090dd71 100644
--- a/eclipse-mylyn-remove-hudson-discovery.patch
+++ b/eclipse-mylyn-remove-hudson-discovery.patch
@@ -1,5 +1,28 @@
---- org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.ui/plugin.xml.bak	2012-03-08 11:41:59.000000000 +0100
-+++ org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.ui/plugin.xml	2012-03-27 14:16:20.168665293 +0200
+diff --git org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.ui/META-INF/MANIFEST.MF org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.ui/META-INF/MANIFEST.MF
+index dc4a512..ab101b8 100644
+--- org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.ui/META-INF/MANIFEST.MF
++++ 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.6
+ 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 org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.ui/build.properties org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.ui/build.properties
+index 5ea1ded..aa184c6 100644
+--- org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.ui/build.properties
++++ org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.ui/build.properties
+@@ -18,4 +18,4 @@ bin.includes = META-INF/,\
+                icons/
+ src.includes = about.html
+ 
+-jars.extra.classpath = platform:/plugin/org.eclipse.ecf,platform:/plugin/org.eclipse.ecf.discovery,platform:/plugin/org.eclipse.ecf.provider.discovery,platform:/plugin/org.eclipse.ecf.provider.jmdns
++#jars.extra.classpath = platform:/plugin/org.eclipse.ecf,platform:/plugin/org.eclipse.ecf.discovery,platform:/plugin/org.eclipse.ecf.provider.discovery,platform:/plugin/org.eclipse.ecf.provider.jmdns
+diff --git org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.ui/plugin.xml org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.ui/plugin.xml
+index d3f9f4f..27afb29 100644
+--- org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.ui/plugin.xml
++++ org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.ui/plugin.xml
 @@ -34,11 +34,4 @@
           </description>
        </wizard>
@@ -12,47 +35,12 @@
 -   </extension>
 -
  </plugin>
---- org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.ui/src/org/eclipse/mylyn/internal/hudson/ui/HudsonUiPlugin.java.bak	2012-03-08 11:41:59.000000000 +0100
-+++ org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.ui/src/org/eclipse/mylyn/internal/hudson/ui/HudsonUiPlugin.java	1970-01-01 01:00:00.000000000 +0100
-@@ -1,35 +0,0 @@
--/*******************************************************************************
-- * Copyright (c) 2011 Tasktop Technologies.
-- * All rights reserved. This program and the accompanying materials
-- * are made available under the terms of the Eclipse Public License v1.0
-- * which accompanies this distribution, and is available at
-- * http://www.eclipse.org/legal/epl-v10.html
-- *
-- * Contributors:
-- *     Tasktop Technologies - initial API and implementation
-- *******************************************************************************/
--
--package org.eclipse.mylyn.internal.hudson.ui;
--
--import org.eclipse.ui.plugin.AbstractUIPlugin;
--import org.osgi.framework.BundleContext;
--
--/**
-- * @author Steffen Pingel
-- */
--public class HudsonUiPlugin extends AbstractUIPlugin {
--
--	public static String ID_PLUGIN = "org.eclipse.mylyn.hudson.ui";
--
--	public HudsonUiPlugin() {
--	}
--
--	@Override
--	public void stop(BundleContext context) throws Exception {
--		if (HudsonStartup.getInstance() != null) {
--			HudsonStartup.getInstance().stop();
--		}
--		super.stop(context);
--	}
--
--}
---- org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.ui/src/org/eclipse/mylyn/internal/hudson/ui/HudsonDiscovery.java.bak	2012-03-08 11:41:59.000000000 +0100
-+++ org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.ui/src/org/eclipse/mylyn/internal/hudson/ui/HudsonDiscovery.java	1970-01-01 01:00:00.000000000 +0100
-@@ -1,192 +0,0 @@
+diff --git org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.ui/src/org/eclipse/mylyn/internal/hudson/ui/HudsonDiscovery.java org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.ui/src/org/eclipse/mylyn/internal/hudson/ui/HudsonDiscovery.java
+deleted file mode 100644
+index 9500904..0000000
+--- org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.ui/src/org/eclipse/mylyn/internal/hudson/ui/HudsonDiscovery.java
++++ /dev/null
+@@ -1,208 +0,0 @@
 -/*******************************************************************************
 - * Copyright (c) 2010, 2011 Itema AS and others.
 - * All rights reserved. This program and the accompanying materials
@@ -98,6 +86,66 @@
 - * @author Steffen Pingel
 - */
 -public class HudsonDiscovery {
+-	/**
+-	 * This class works around a source incompatibility between the org.eclipse.ecf.discovery version in Luna and
+-	 * earlier versions. Version 5.0 added the triggerDiscovery method to IServiceListener. This class can be extended
+-	 * in order to implement this method without the @Overide annotation causing compilation to fail against earlier
+-	 * versions (e.g. Kepler).
+-	 */
+-	private static abstract class AbstractServiceListener {
+-		public abstract boolean triggerDiscovery();
+-	}
+-
+-	private final class HudsonServiceListener extends AbstractServiceListener implements IServiceListener {
+-		public void serviceDiscovered(IServiceEvent anEvent) {
+-			IServiceInfo serviceInfo = anEvent.getServiceInfo();
+-			IServiceID serviceId = serviceInfo.getServiceID();
+-			IServiceTypeID serviceTypeId = serviceId.getServiceTypeID();
+-			// Note that Jenkins will claim that it's both Jenkins and
+-			// Hudson for backward compatibility.
+-			if (serviceTypeId.getName().equals(JENKINS_MDNS_ID)) {
+-				IServiceProperties properties = serviceInfo.getServiceProperties();
+-				try {
+-					if (properties.getProperty(URL_PROPERTY) == null) {
+-						notifyMessage(Messages.JenkinsDiscovery_MessageTitle, NLS.bind(
+-								Messages.JenkinsDiscovery_MissingURL, new Object[] { serviceInfo.getLocation()
+-										.getHost() }));
+-					} else {
+-						issueJenkinsNotification(properties);
+-					}
+-				} catch (URISyntaxException e) {
+-					StatusHandler.log(new Status(IStatus.ERROR, HudsonConnectorUi.ID_PLUGIN, NLS.bind(
+-							Messages.Discovery_IncorrectURI, new Object[] { properties.getProperty(URL_PROPERTY)
+-									.toString() }), e));
+-				}
+-			}
+-			if (serviceTypeId.getName().equals(HUDSON_MDNS_ID)) {
+-				IServiceProperties properties = serviceInfo.getServiceProperties();
+-				try {
+-					if (properties.getProperty(URL_PROPERTY) == null) {
+-						notifyMessage(Messages.HudsonDiscovery_MessageTitle, NLS.bind(
+-								Messages.HudsonDiscovery_MissingURL,
+-								new Object[] { serviceInfo.getLocation().getHost() }));
+-					} else {
+-						issueHudsonNotification(properties);
+-					}
+-				} catch (URISyntaxException e) {
+-					StatusHandler.log(new Status(IStatus.ERROR, HudsonConnectorUi.ID_PLUGIN, NLS.bind(
+-							Messages.Discovery_IncorrectURI, new Object[] { properties.getProperty(URL_PROPERTY)
+-									.toString() }), e));
+-				}
+-			}
+-		}
+-
+-		public void serviceUndiscovered(IServiceEvent anEvent) {
+-			// Ignore this for now
+-		}
+-
+-		@Override
+-		public boolean triggerDiscovery() {
+-			return false;
+-		}
+-	}
 -
 -	private static final String ECF_DISCOVERY_JMDNS = "ecf.discovery.jmdns"; //$NON-NLS-1$
 -
@@ -145,51 +193,7 @@
 -		try {
 -			container = getContainer();
 -			final IDiscoveryLocator adapter = (IDiscoveryLocator) container.getAdapter(IDiscoveryLocator.class);
--			adapter.addServiceListener(new IServiceListener() {
--				public void serviceDiscovered(IServiceEvent anEvent) {
--					IServiceInfo serviceInfo = anEvent.getServiceInfo();
--					IServiceID serviceId = serviceInfo.getServiceID();
--					IServiceTypeID serviceTypeId = serviceId.getServiceTypeID();
--					// Note that Jenkins will claim that it's both Jenkins and
--					// Hudson for backward compatibility.
--					if (serviceTypeId.getName().equals(JENKINS_MDNS_ID)) {
--						IServiceProperties properties = serviceInfo.getServiceProperties();
--						try {
--							if (properties.getProperty(URL_PROPERTY) == null) {
--								notifyMessage(Messages.JenkinsDiscovery_MessageTitle, NLS.bind(
--										Messages.JenkinsDiscovery_MissingURL, new Object[] { serviceInfo.getLocation()
--												.getHost() }));
--							} else {
--								issueJenkinsNotification(properties);
--							}
--						} catch (URISyntaxException e) {
--							StatusHandler.log(new Status(IStatus.ERROR, HudsonConnectorUi.ID_PLUGIN, NLS.bind(
--									Messages.Discovery_IncorrectURI,
--									new Object[] { properties.getProperty(URL_PROPERTY).toString() }), e));
--						}
--					}
--					if (serviceTypeId.getName().equals(HUDSON_MDNS_ID)) {
--						IServiceProperties properties = serviceInfo.getServiceProperties();
--						try {
--							if (properties.getProperty(URL_PROPERTY) == null) {
--								notifyMessage(Messages.HudsonDiscovery_MessageTitle, NLS.bind(
--										Messages.HudsonDiscovery_MissingURL, new Object[] { serviceInfo.getLocation()
--												.getHost() }));
--							} else {
--								issueHudsonNotification(properties);
--							}
--						} catch (URISyntaxException e) {
--							StatusHandler.log(new Status(IStatus.ERROR, HudsonConnectorUi.ID_PLUGIN, NLS.bind(
--									Messages.Discovery_IncorrectURI,
--									new Object[] { properties.getProperty(URL_PROPERTY).toString() }), e));
--						}
--					}
--				}
--
--				public void serviceUndiscovered(IServiceEvent anEvent) {
--					// Ignore this for now
--				}
--			});
+-			adapter.addServiceListener(new HudsonServiceListener());
 -			container.connect(null, null);
 -
 -		} catch (ContainerCreateException e) {
@@ -227,7 +231,7 @@
 -		String url = properties.getProperty(URL_PROPERTY).toString();
 -		String id = getId(properties);
 -		if (isNew(url, id)) {
--			// Change the first segment (org.eclipse.mylyn.hudson) to the id of 
+-			// Change the first segment (org.eclipse.mylyn.hudson) to the id of
 -			// the new repository type when we start differentiation between the two
 -			notifyMessage(
 -					Messages.JenkinsDiscovery_MessageTitle,
@@ -245,20 +249,44 @@
 -	}
 -
 -}
---- org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.ui/build.properties.bak	2012-03-27 14:48:20.000000000 +0200
-+++ org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.ui/build.properties	2012-03-27 14:48:32.555612843 +0200
-@@ -18,4 +18,4 @@
-                icons/
- src.includes = about.html
- 
--jars.extra.classpath = platform:/plugin/org.eclipse.ecf,platform:/plugin/org.eclipse.ecf.discovery,platform:/plugin/org.eclipse.ecf.provider.discovery,platform:/plugin/org.eclipse.ecf.provider.jmdns
-+#jars.extra.classpath = platform:/plugin/org.eclipse.ecf,platform:/plugin/org.eclipse.ecf.discovery,platform:/plugin/org.eclipse.ecf.provider.discovery,platform:/plugin/org.eclipse.ecf.provider.jmdns
---- org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.ui/META-INF/MANIFEST.MF.orig	2012-03-08 11:41:59.000000000 +0100
-+++ org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.ui/META-INF/MANIFEST.MF	2012-04-13 11:31:55.411145074 +0200
-@@ -20,5 +20,4 @@
- Bundle-ActivationPolicy: lazy
- Bundle-RequiredExecutionEnvironment: JavaSE-1.6
- 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 org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.ui/src/org/eclipse/mylyn/internal/hudson/ui/HudsonUiPlugin.java org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.ui/src/org/eclipse/mylyn/internal/hudson/ui/HudsonUiPlugin.java
+deleted file mode 100644
+index a160eb0..0000000
+--- org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.ui/src/org/eclipse/mylyn/internal/hudson/ui/HudsonUiPlugin.java
++++ /dev/null
+@@ -1,35 +0,0 @@
+-/*******************************************************************************
+- * Copyright (c) 2011 Tasktop Technologies.
+- * All rights reserved. This program and the accompanying materials
+- * are made available under the terms of the Eclipse Public License v1.0
+- * which accompanies this distribution, and is available at
+- * http://www.eclipse.org/legal/epl-v10.html
+- *
+- * Contributors:
+- *     Tasktop Technologies - initial API and implementation
+- *******************************************************************************/
+-
+-package org.eclipse.mylyn.internal.hudson.ui;
+-
+-import org.eclipse.ui.plugin.AbstractUIPlugin;
+-import org.osgi.framework.BundleContext;
+-
+-/**
+- * @author Steffen Pingel
+- */
+-public class HudsonUiPlugin extends AbstractUIPlugin {
+-
+-	public static String ID_PLUGIN = "org.eclipse.mylyn.hudson.ui";
+-
+-	public HudsonUiPlugin() {
+-	}
+-
+-	@Override
+-	public void stop(BundleContext context) throws Exception {
+-		if (HudsonStartup.getInstance() != null) {
+-			HudsonStartup.getInstance().stop();
+-		}
+-		super.stop(context);
+-	}
+-
+-}
diff --git a/eclipse-mylyn-remove-nullable-annotation.patch b/eclipse-mylyn-remove-nullable-annotation.patch
new file mode 100644
index 0000000..19f34fe
--- /dev/null
+++ b/eclipse-mylyn-remove-nullable-annotation.patch
@@ -0,0 +1,19 @@
+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 a882490..24a38c0 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 8c077e351de3d0857512e7c4e48ad0f0a56e96ca 
+%global tag R_3_12_0
 %global incubator_tag 	a1a4646ea6d027e89f828a9c45bd8fa79721a90c
 
 %{!?scl:%global _non_scl_javadir %{_javadir}}
@@ -11,7 +11,7 @@
 Name:    %{?scl_prefix}eclipse-mylyn
 Summary: Eclipse Mylyn main feature.
 Version: 3.12.0
-Release: 0.7.1.git20140509%{?dist}
+Release: 0.7%{?dist}
 License: EPL
 URL: http://www.eclipse.org/mylyn
 
@@ -32,6 +32,7 @@ Patch4: %{pkg_name}-merge-incubator.patch
 Patch5: %{pkg_name}-bug-419133.patch
 Patch6: lucene4.patch
 Patch7: %{pkg_name}-remove-epubcheck-tests.patch
+Patch8: %{pkg_name}-remove-nullable-annotation.patch
 
 BuildArch: noarch
 
@@ -41,6 +42,7 @@ BuildRequires: eclipse-cdt
 BuildRequires: eclipse-egit
 BuildRequires: eclipse-jgit
 BuildRequires: eclipse-subclipse
+BuildRequires: eclipse-license
 BuildRequires: tycho >= 0.14.1-5
 BuildRequires: eclipse-egit
 BuildRequires: jacoco
@@ -291,6 +293,7 @@ pushd org.eclipse.mylyn.tasks
 %patch6 -b .sav
 popd
 %patch7 -p1
+%patch8
 
 #Disable plugins we can live without and for some reason are redundant (unpackaged or causing build failures).
 #There must be empty line after each %%pom_* macro invocation.
@@ -347,6 +350,10 @@ rm org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.ui/src/org/eclipse/mylyn/in
 sed -i -e "s/compatible/greaterOrEqual/g" org.eclipse.mylyn.versions/org.eclipse.mylyn.versions.sdk-feature/feature.xml
 sed -i -e "s/e3.5/e3.6/g" org.eclipse.mylyn.commons/org.eclipse.mylyn.commons-target/pom.xml
 
+#Set source level to 1.8 for bundles which require it
+sed -i -e "s/JavaSE-1.6/JavaSE-1.8/g" org.eclipse.mylyn.tasks/org.eclipse.mylyn.tasks.core/META-INF/MANIFEST.MF
+sed -i -e "s/JavaSE-1.6/JavaSE-1.8/g" org.eclipse.mylyn.tasks/org.eclipse.mylyn.tasks.ui/META-INF/MANIFEST.MF
+
 %build
 %{?scl:%scl_maven_opts}
 export MAVEN_OPTS="-XX:CompileCommand=exclude,org/eclipse/tycho/core/osgitools/EquinoxResolver,newState ${MAVEN_OPTS}"
@@ -497,8 +504,6 @@ set -e
 %{install_loc}/mylyn/eclipse/plugins/jaxp.jar
 %{install_loc}/mylyn/eclipse/plugins/google-gson.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
 
 %files context-java
 %{install_loc}/mylyn/eclipse/features/org.eclipse.mylyn.java_feature_*
@@ -507,42 +512,30 @@ set -e
 %{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
 
 %files context-pde
 %{install_loc}/mylyn/eclipse/features/org.eclipse.mylyn.pde_feature_*
 %{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.pde.ui_*.jar
-%doc org.eclipse.mylyn.context/org.eclipse.mylyn.pde-feature/epl-v10.html
-%doc org.eclipse.mylyn.context/org.eclipse.mylyn.pde-feature/license.html
 
 %files context-cdt
 %{install_loc}/mylyn/eclipse/features/org.eclipse.cdt.mylyn_*
 %{install_loc}/mylyn/eclipse/plugins/org.eclipse.cdt.mylyn.ui_*.jar
-%doc org.eclipse.mylyn.context/org.eclipse.mylyn.cdt-feature/epl-v10.html
-%doc org.eclipse.mylyn.context/org.eclipse.mylyn.cdt-feature/license.html
 
 %files context-team
 %{install_loc}/mylyn/eclipse/features/org.eclipse.mylyn.team_feature_*
 %{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.team.ui_*.jar
-%doc org.eclipse.mylyn.context/org.eclipse.mylyn.team-feature/epl-v10.html
-%doc org.eclipse.mylyn.context/org.eclipse.mylyn.team-feature/license.html
 
 %files ide
 %{install_loc}/mylyn/eclipse/features/org.eclipse.mylyn.ide_feature_*
 %{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.team.cvs_*.jar
 %{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.bugzilla.ide_*.jar
 %{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.ide.ui_*.jar
-%doc org.eclipse.mylyn.tasks/org.eclipse.mylyn.tasks.ide-feature/epl-v10.html
-%doc org.eclipse.mylyn.tasks/org.eclipse.mylyn.tasks.ide-feature/license.html
 
 %files tasks-bugzilla
 %{install_loc}/mylyn/eclipse/features/org.eclipse.mylyn.bugzilla_feature_*
 %{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.bugzilla.core_*.jar
 %{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.bugzilla.ui_*.jar
 %{install_loc}/mylyn/eclipse/redhat-bugzilla-custom-transitions.txt
-%doc org.eclipse.mylyn.tasks/org.eclipse.mylyn.bugzilla-feature/epl-v10.html
-%doc org.eclipse.mylyn.tasks/org.eclipse.mylyn.bugzilla-feature/license.html
 
 %files tasks-trac
 %{install_loc}/mylyn/eclipse/features/org.eclipse.mylyn.trac_feature_*
@@ -550,14 +543,10 @@ set -e
 %{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.trac.ui_*.jar
 %{install_loc}/mylyn/eclipse/features/org.eclipse.mylyn.trac.wiki_feature_*
 %{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.trac.wiki_*.jar
-%doc org.eclipse.mylyn.tasks/org.eclipse.mylyn.trac-feature/epl-v10.html
-%doc org.eclipse.mylyn.tasks/org.eclipse.mylyn.trac-feature/license.html
 
 %files tasks-web
 %{install_loc}/mylyn/eclipse/features/org.eclipse.mylyn.web.tasks_feature_*
 %{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.web.tasks_*.jar
-%doc org.eclipse.mylyn.tasks/org.eclipse.mylyn.web.tasks-feature/epl-v10.html
-%doc org.eclipse.mylyn.tasks/org.eclipse.mylyn.web.tasks-feature/license.html
 
 %files docs-wikitext
 %{install_loc}/mylyn/eclipse/features/org.eclipse.mylyn.wikitext_feature_*
@@ -582,14 +571,10 @@ set -e
 %{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.wikitext.tasks.ui_*.jar
 %{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.wikitext.context.ui_*.jar
 %{install_loc}/mylyn/eclipse/plugins/jsoup.jar
-%doc org.eclipse.mylyn.docs/org.eclipse.mylyn.wikitext-feature/epl-v10.html
-%doc org.eclipse.mylyn.docs/org.eclipse.mylyn.wikitext-feature/license.html
 
 %files docs-htmltext
 %{install_loc}/mylyn/eclipse/features/org.eclipse.mylyn.htmltext_*
 %{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.htmltext.ui_*.jar
-%doc org.eclipse.mylyn.docs/org.eclipse.mylyn.htmltext-feature/epl-v10.html
-%doc org.eclipse.mylyn.docs/org.eclipse.mylyn.htmltext-feature/license.html
 
 %files docs-epub
 %{install_loc}/mylyn/eclipse/features/org.eclipse.mylyn.docs.epub_*
@@ -598,49 +583,35 @@ set -e
 %{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.docs.epub.ui_*.jar
 %{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.docs.epub.ant.core_*.jar
 %{install_loc}/mylyn/eclipse/plugins/tika*.jar
-%doc org.eclipse.mylyn.docs/org.eclipse.mylyn.docs.epub-feature/epl-v10.html
-%doc org.eclipse.mylyn.docs/org.eclipse.mylyn.docs.epub-feature/license.html
 
 %files versions
 %{install_loc}/mylyn/eclipse/features/org.eclipse.mylyn.versions_*
 %{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.versions.core_*.jar
 %{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.versions.ui_*.jar
-%doc org.eclipse.mylyn.versions/org.eclipse.mylyn.versions-feature/epl-v10.html
-%doc org.eclipse.mylyn.versions/org.eclipse.mylyn.versions-feature/license.html
 
 %files versions-git
 %{install_loc}/mylyn/eclipse/features/org.eclipse.mylyn.git_*
 %{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.git.core_*.jar
 %{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.git.ui_*.jar
-%doc org.eclipse.mylyn.versions/org.eclipse.mylyn.git-feature/epl-v10.html
-%doc org.eclipse.mylyn.versions/org.eclipse.mylyn.git-feature/license.html
 
 %files versions-cvs
 %{install_loc}/mylyn/eclipse/features/org.eclipse.mylyn.cvs_*
 %{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.cvs.core_*.jar
-%doc org.eclipse.mylyn.versions/org.eclipse.mylyn.cvs-feature/epl-v10.html
-%doc org.eclipse.mylyn.versions/org.eclipse.mylyn.cvs-feature/license.html
 
 %files versions-subclipse
 %{install_loc}/mylyn/eclipse/features/org.eclipse.mylyn.subclipse_*
 %{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.subclipse.core_*.jar
 %{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.subclipse.ui_*.jar
-%doc org.eclipse.mylyn.versions/org.eclipse.mylyn.subclipse-feature/epl-v10.html
-%doc org.eclipse.mylyn.versions/org.eclipse.mylyn.subclipse-feature/license.html
 
 %files builds
 %{install_loc}/mylyn/eclipse/features/org.eclipse.mylyn.builds_*
 %{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.builds.core_*.jar
 %{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.builds.ui_*.jar
-%doc org.eclipse.mylyn.builds/org.eclipse.mylyn.builds-feature/epl-v10.html
-%doc org.eclipse.mylyn.builds/org.eclipse.mylyn.builds-feature/license.html
 
 %files builds-hudson
 %{install_loc}/mylyn/eclipse/features/org.eclipse.mylyn.hudson_*
 %{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.hudson.core_*.jar
 %{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.hudson.ui_*.jar
-%doc org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson-feature/epl-v10.html
-%doc org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson-feature/license.html
 
 %files sdk
 %{install_loc}/mylyn/eclipse/features/org.eclipse.mylyn.builds.sdk_*
@@ -661,14 +632,13 @@ set -e
 %{install_loc}/mylyn/eclipse/plugins/xerces-j2.jar
 %{install_loc}/mylyn/eclipse/plugins/xalan-j2-serializer.jar
 %{install_loc}/mylyn/eclipse/plugins/xml-commons-resolver.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
 
 %files tests
 %{_javadir}/mylyn-tests
 
 %changelog
-* Thu Jul 10 2014 Sami Wagiaalla <swagiaal at redhat.com> - 3.12.0-0.7.git20140509
+* Thu Jul 10 2014 Sami Wagiaalla <swagiaal at redhat.com> - 3.12.0-0.7
+- Update to R_3_12_0 tag.
 - Add mylyn-tests package.
 
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.12.0-0.6.git20140509
diff --git a/fetch-eclipse-mylyn.sh b/fetch-eclipse-mylyn.sh
index ba49cf0..d194a42 100755
--- a/fetch-eclipse-mylyn.sh
+++ b/fetch-eclipse-mylyn.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-RELEASE_TAG="8c077e351de3d0857512e7c4e48ad0f0a56e96ca"
+RELEASE_TAG="R_3_12_0"
 FETCHED_SOURCES_NAME="eclipse-mylyn-${RELEASE_TAG}-fetched-src"
 
 #clean up old runs

More information about the scm-commits mailing list