From 852e257e4be32a6bb23312de5c227893fae7ecae Mon Sep 17 00:00:00 2001
From: nickboldt <nboldt@redhat.com>
Date: Sep 18 2017 13:53:01 +0000
Subject: finally managed to upload updated eclipse-mylyn-e_4_7_m_3_23_x-fetched-src.tar.xz; commit sources file

remove ref to .mfiles-docs-epub
docs/org.eclipse.mylyn.docs.epub.ant.core moved to epub/core/org.eclipse.mylyn.docs.epub.ant
fix fetch-eclipse-mylyn.sh so it pulls the latest from the branches, even if the submodules are not correctly updated
add missing source to sources

Signed-off-by: nickboldt <nboldt@redhat.com>

---

diff --git a/eclipse-mylyn.spec b/eclipse-mylyn.spec
index 9b8c622..c3118db 100644
--- a/eclipse-mylyn.spec
+++ b/eclipse-mylyn.spec
@@ -302,7 +302,7 @@ sed -i -e '/All\(Gerrit\|Reviews\)Tests;/d' -e 's/AllGerritTests.class,//' -e '/
 
 # These are not intended to be shipped by upstream, see ebz#467669 and ebz#467694 and ebz#260666
 %pom_disable_module org.eclipse.mylyn.commons.identity.ui org.eclipse.mylyn.commons
-%pom_disable_module org.eclipse.mylyn.docs.epub.ant.core org.eclipse.mylyn.docs/docs
+%pom_disable_module org.eclipse.mylyn.docs.epub.ant org.eclipse.mylyn.docs/epub/core
 %pom_disable_module org.eclipse.mylyn.help.sdk org.eclipse.mylyn.tasks
 
 # Don't build wikitext integration tests
@@ -403,8 +403,6 @@ install %{SOURCE6} \
 
 %files docs-wikitext -f .mfiles-docs -f org.eclipse.mylyn.docs/wikitext/core/.mfiles
 
-%files docs-epub -f .mfiles-docs-epub
-
 %files versions -f .mfiles-versions
 
 %files versions-git -f .mfiles-versions-git
@@ -426,6 +424,7 @@ install %{SOURCE6} \
 %changelog
 * Thu Sep 14 2017 nboldt <nickboldt+redhat@gmail.com> - 3.23.1-1
 - Update to latest upstream release 3.23.1
+- docs/org.eclipse.mylyn.docs.epub.ant.core moved to epub/core/org.eclipse.mylyn.docs.epub.ant
 
 * Thu Jul 06 2017 Mat Booth <mat.booth@redhat.com> - 3.23.0-3
 - Fix parent pom relative path
diff --git a/fetch-eclipse-mylyn.sh b/fetch-eclipse-mylyn.sh
index 2afd1a4..c261684 100755
--- a/fetch-eclipse-mylyn.sh
+++ b/fetch-eclipse-mylyn.sh
@@ -2,27 +2,36 @@
 
 set -e
 
-RELEASE_TAG="e_4_7_m_3_23_x"
+BRANCH_NAME="e_4_7_m_3_23_x"
 WIKITEXT_TAG="wikitext.core-3.0.18"
-FETCHED_SOURCES_NAME="eclipse-mylyn-${RELEASE_TAG}-fetched-src"
+FETCHED_SOURCES_NAME="eclipse-mylyn-${BRANCH_NAME}-fetched-src"
 
 #clean up old runs
-rm -rf $FETCHED_SOURCES_NAME
+rm -rf ${FETCHED_SOURCES_NAME}
 
 #checkout
-git clone --recursive git://git.eclipse.org/gitroot/mylyn/org.eclipse.mylyn.all.git $FETCHED_SOURCES_NAME
-cd $FETCHED_SOURCES_NAME
-git checkout $RELEASE_TAG
+git clone --recursive git://git.eclipse.org/gitroot/mylyn/org.eclipse.mylyn.all.git ${FETCHED_SOURCES_NAME}
+cd ${FETCHED_SOURCES_NAME}
+git checkout ${BRANCH_NAME}
 git submodule update
 
 #checkout wikitext
 pushd org.eclipse.mylyn.docs
-git checkout $WIKITEXT_TAG
+git checkout ${WIKITEXT_TAG}
 popd
 
-#remove precomipled binaries
-find . -type f -name ".class" -exec rm {} \;
-find . -type f -name ".jar" -exec rm {} \;
+#remove precompiled binaries
+find . -type f -name "*.class" -o -name "*.jar" -exec rm {} \;
+
+# update from BRANCH_NAME branch to get latest - note that org.eclipse.mylyn.versions and org.eclipse.mylyn.docs don't have this branch
+for i in org.eclipse.mylyn*; do
+  pushd $i >/dev/null
+    echo "Pull latest from ${BRANCH_NAME} into $i ... "
+    git pull origin ${BRANCH_NAME}
+  popd >/dev/null
+done
+
+# purge git metadata
 rm -rf .git
 find . -type f -name ".gitignore" -exec rm {} \;
 find . -type f -name ".gitmodules" -exec rm {} \;
@@ -30,5 +39,5 @@ find . -type f -name ".gitmodules" -exec rm {} \;
 cd ..
 
 #package and clean up
-tar -caf $FETCHED_SOURCES_NAME.tar.xz $FETCHED_SOURCES_NAME
-rm -rf $FETCHED_SOURCES_NAME
+tar -caf ${FETCHED_SOURCES_NAME}.tar.xz ${FETCHED_SOURCES_NAME}
+# rm -rf ${FETCHED_SOURCES_NAME}
diff --git a/sources b/sources
index 59d6c3c..8092087 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,2 @@
-SHA512 (eclipse-mylyn-e9e79d9d73ec879d0db2b909014e6e1dce7ab806-incubator-fetched-src.tar.xz) = c727710f012bd3b55c91c27a2c8a7f985b022485088f580ed1649202db049abdaf3ef5f00a26b0f15335f15628a323cacf5d2408c708443be787fb50d15beba5
-SHA512 (eclipse-mylyn-e_4_7_m_3_23_x-fetched-src.tar.xz) = 8e7911ca7e314ebdd3907fc668a72b05a5c5705a0f5c44fefccfe8d03d2e95b660a701cedac443e718ff80fec4635b1f570883135a7c07ed49fd46ec6426f0a7
-SHA512 (fetch-eclipse-mylyn-incubator.sh) = ab144fc50682b03fdcbf6ea637f143a2ebb2363b1cead9ec4760a88e455fbdc6c2cc0ecbad3a24f856d8dbf08190cf40787ef6b7136b8254139c264fe3c72820
-SHA512 (fetch-eclipse-mylyn.sh) = 17bad614f9060078f10620c665043f495fefca48d7ab99fa323a4f9fad533e8253b9a6be6a5b701205821551ac56497723a5bbab5d36406b2d06e629a1f8f889
+SHA512 (eclipse-mylyn-e_4_7_m_3_23_x-fetched-src.tar.xz) = f8e7785733bad2cd14ebd1de80d0caa9d4ba33c909c29aa6d738cf3d7badc1a2d842ea9ccdb56a6e8b5d3d250076fa34616555bc382dd10de2f333b48b496ef4
+SHA512 (eclipse-mylyn-e9e79d9d73ec879d0db2b909014e6e1dce7ab806-incubator-fetched-src.tar.xz) = 4a4c22745166efe581781cc672493f7fe67a9b26fbb19626e55ab3acd9488715c939aca7a3e17be7430b855e2a2ea228eee9dbb469038a5b51f895a5b4481d7b