From a99f625f368325385b6fce5422a29e65c3919263 Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Nov 08 2016 12:31:30 +0000
Subject: Change tests packaging to avoid broken symlinks in sdk package


- Move development features into tests package

---

diff --git a/eclipse-mylyn.spec b/eclipse-mylyn.spec
index b4e8d8d..f95c52d 100644
--- a/eclipse-mylyn.spec
+++ b/eclipse-mylyn.spec
@@ -10,7 +10,7 @@
 Name:    eclipse-mylyn
 Summary: Eclipse Mylyn main feature.
 Version: 3.20.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: EPL
 URL: http://www.eclipse.org/mylyn
 
@@ -316,13 +316,13 @@ sed -i -e "s/JavaSE-1.7/JavaSE-1.8/g" org.eclipse.mylyn.tasks/org.eclipse.mylyn.
 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
 
 %mvn_package "::{target,pom}::" __noinstall
+%mvn_package ":*.test{s,_feature}" tests
+%mvn_package ":org.eclipse.mylyn.*development" tests
 %mvn_package "::jar:sources:" sdk
 %mvn_package ":*.sdk{,_feature}" sdk
 %mvn_package ":org.eclipse.mylyn.tests.util" sdk
 %mvn_package ":org.eclipse.mylyn.{context,commons}.sdk.util" sdk
 %mvn_package ":org.eclipse.mylyn.context.sdk.java" sdk
-%mvn_package ":org.eclipse.mylyn.*development" sdk
-%mvn_package ":*.test{s,_feature}" tests
 %mvn_package "org.eclipse.mylyn.builds:*hudson*" builds-hudson
 %mvn_package "org.eclipse.mylyn.builds:" builds
 %mvn_package "org.eclipse.mylyn.context:*cdt.mylyn*" context-cdt
@@ -339,14 +339,6 @@ sed -i -e "s|@NonNull||g" org.eclipse.mylyn.tasks/connector-bugzilla-rest/org.ec
 %mvn_package "org.eclipse.mylyn.versions:" versions
 %mvn_package "org.eclipse.mylyn{,.commons,.context,.context.features,.tasks}:" commons
 
-# TODO fix this
-for b in org.eclipse.mylyn.docs/org.eclipse.mylyn.wikitext.commonmark.tests ; do
-  sed -i "/^Bundle-Localization/d" $b/META-INF/MANIFEST.MF
-  sed -i "s|META-INF/l10n/bundle\.properties|OSGI-INF/|" $b/build.properties
-  mkdir -p $b/OSGI-INF/l10n
-  mv $b/META-INF/l10n/bundle.properties $b/OSGI-INF/l10n/bundle.properties
-done
-
 %build
 %mvn_build -f -j -- -Ddist.qualifier="\'v\'yyyyMMdd-HHmm"
 
@@ -392,6 +384,10 @@ install %{SOURCE6} \
 %files tests -f .mfiles-tests
 
 %changelog
+* Tue Nov 08 2016 Mat Booth <mat.booth@redhat.com> - 3.20.2-2
+- Change tests packaging to avoid broken symlinks in sdk package
+- Move development features into tests package
+
 * Wed Aug 03 2016 Sopot Cela <scela@redhat.com> - 3.20.2-1
 - Upgrade to 3.20.2