[eclipse-wtp-servertools] Update to upstram 3.4.1

[Vladimir Kostadinov]

commit 5be1393a0ee04476196330d68ef58064449ab03a
Author: vladimir <vladimir.kostadinov at gmail.com>
Date:   Fri Oct 26 12:26:36 2012 +0300

    Update to upstram 3.4.1

 .gitignore                   |    1 +
 eclipse-wtp-servertools.spec |   19 ++++++++++++++++---
 fetch-wtp-servertools.sh     |   29 ++++++++++++++++-------------
 sources                      |    2 +-
 4 files changed, 34 insertions(+), 17 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3dd0aba..43d99d2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ eclipse-wtp-servertools-3.3.1-fetched-src.tar.bz2
 eclipse-wtp-servertools-3.4.0-fetched-src.tar.bz2
 /noarch
 /eclipse-wtp-servertools-3.4.0
+/eclipse-wtp-servertools-3.4.1-fetched-src.tar.bz2
diff --git a/eclipse-wtp-servertools.spec b/eclipse-wtp-servertools.spec
index e2dc7f5..f7469e8 100644
--- a/eclipse-wtp-servertools.spec
+++ b/eclipse-wtp-servertools.spec
@@ -2,8 +2,8 @@
 %global install_loc		%{_datadir}/eclipse/dropins
 
 Name:			eclipse-wtp-servertools
-Version:		3.4.0
-Release:		3%{?dist}
+Version:		3.4.1
+Release:		1%{?dist}
 Summary:		WTP Server Tools
 
 Group:			Development/Tools
@@ -37,9 +37,17 @@ server components.
 #Remove license attributes from feature.xml
 find -name feature.xml -exec sed -i -e 's/license-feature.*"//' '{}' \;
 
+#Orbit links
+rm -rf orbit
+mkdir orbit
+pushd orbit
+%{__ln_s} %{_javadir}/emf/eclipse/plugins/org.eclipse.emf.edit_*.jar
+popd
+
+
 %build
 eclipse-pdebuild -f org.eclipse.wst.server_ui.feature \
-	-d "emf gef eclipse-wtp-common"
+	-d "emf gef eclipse-wtp-common" -o `pwd`/orbit
 
 eclipse-pdebuild -f org.eclipse.jst.server_ui.feature \
 	-d "emf gef eclipse-wtp-common"
@@ -85,6 +93,11 @@ popd
 %doc docs/org.eclipse.jst.server.ui.doc.user/about.html
 
 %changelog
+* Thu Oct 25 2012 Gerard Ryan <galileo at fedoraproject.org> - 3.4.1-1
+- Update to latest upstream release.
+- Change fetch script to use git.eclipse.org.
+- Add orbital dependency for moved emf jar.
+
 * Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.4.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/fetch-wtp-servertools.sh b/fetch-wtp-servertools.sh
index f90c405..94cf678 100755
--- a/fetch-wtp-servertools.sh
+++ b/fetch-wtp-servertools.sh
@@ -1,23 +1,25 @@
 #!/bin/bash
 
-RELEASE_TAG="HEAD"
-DOT_TAG="3.4.0"
-SRC_DIR="eclipse-wtp-servertools-${DOT_TAG}"
-MODULE="servertools"
-PATCH_PLUGIN="${MODULE}/plugins/org.eclipse.wst.server.preview"
+GIT_TAG="R3_4_1"
+DOCS_TAG="master"
+VERSION=`echo ${GIT_TAG} | sed -e 's/_/./g' | sed -e 's/R//'`
+SRC_DIR="eclipse-wtp-servertools-${VERSION}"
 
 # Cleanup
 rm -rf ${SRC_DIR}
 rm -rf ${MODULE}
 
-# CVS Export
-cvs -d :pserver:anonymous at dev.eclipse.org:/cvsroot/webtools export -r ${RELEASE_TAG} ${MODULE}
+# Get webtools.servertools tarball from git.eclipse.org, and extract
+curl -o ${GIT_TAG}.tar.bz2 http://git.eclipse.org/c/servertools/webtools.servertools.git/snapshot/${GIT_TAG}.tar.bz2
+tar xfj ${GIT_TAG}.tar.bz2
 
-# Fix Jetty & javax.servlet dependecies
-rm -rf ${PATCH_PLUGIN}
-cvs -d :pserver:anonymous at dev.eclipse.org:/cvsroot/webtools export -r ${RELEASE_TAG} ${PATCH_PLUGIN}
+# Get webtools.servertools.docs tarball from git.eclipse.org, and extract
+curl -o ${DOCS_TAG}.tar.bz2 http://git.eclipse.org/c/servertools/webtools.servertools.docs.git/snapshot/webtools.servertools.docs-${DOCS_TAG}.tar.bz2
+tar xfj ${DOCS_TAG}.tar.bz2
 
-pushd ${MODULE}
+cp -r webtools.servertools.docs-${DOCS_TAG}/docs ${GIT_TAG}
+
+pushd ${GIT_TAG}
 # Cleanup the checkout
 rm -rf tests
 
@@ -27,13 +29,14 @@ chmod 644 `find | grep -e "\.xml$"`
 popd
 
 # Rename dir
-mv ${MODULE} ${SRC_DIR} 
+mv ${GIT_TAG} ${SRC_DIR}
 
 # Create the Tarball
 rm -f ${SRC_DIR}-fetched-src.tar.bz2
 tar cjf ${SRC_DIR}-fetched-src.tar.bz2 ${SRC_DIR}
 
 # Cleanup sources
-rm -rf ${SRC_DIR}
+rm -rf ${SRC_DIR} webtools.servertools.docs-${DOCS_TAG}
+rm -f ${GIT_TAG}.tar.bz2 ${DOCS_TAG}.tar.bz2
 
 exit 0
diff --git a/sources b/sources
index 2c55388..61892e9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9ed35e183cabad918dad070fe4d75911  eclipse-wtp-servertools-3.4.0-fetched-src.tar.bz2
+97dfd8d92a7f027451ee73440aa8ab52  eclipse-wtp-servertools-3.4.1-fetched-src.tar.bz2