[eclipse-wtp-common] Update to 3.3.0.

[Andrew Robinson]

commit d1e1485497ac7213442855bc836d881df685dc18
Author: Andrew Robinson <arobinso at redhat.com>
Date:   Fri Sep 23 13:19:22 2011 -0400

    Update to 3.3.0.

 .gitignore                 |    1 +
 eclipse-wtp-common.spec    |   16 ++++++++++++----
 fetch-wtp-common-source.sh |   13 ++++++++-----
 sources                    |    2 +-
 4 files changed, 22 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 00b7f54..7844927 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 
 eclipse-wtp-common-R3_2_4-fetched-src.tar.bz2
+eclipse-wtp-common-R3_3_0-fetched-src.tar.bz2
diff --git a/eclipse-wtp-common.spec b/eclipse-wtp-common.spec
index dff5c95..b8ceaec 100644
--- a/eclipse-wtp-common.spec
+++ b/eclipse-wtp-common.spec
@@ -2,13 +2,13 @@
 %global install_loc			%{_datadir}/eclipse/dropins
 
 Name:			eclipse-wtp-common
-Version:		3.2.4
+Version:		3.3.0
 Release:		1%{?dist}
 Summary:		Common infrastructure and utilities developed and used with WTP
 
 License:		EPL
 URL:			http://www.eclipse.org/webtools/common/
-Source0:		eclipse-wtp-common-R3_2_4-fetched-src.tar.bz2
+Source0:		eclipse-wtp-common-R3_3_0-fetched-src.tar.bz2
 Source1:		fetch-wtp-common-source.sh
 
 BuildArch:		noarch
@@ -35,6 +35,11 @@ extensible URI resolver.
 %setup -q
 
 %build
+%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.license
+
+%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.wst.common.fproj \
+	-d "emf gef"
+
 %{eclipse_base}/buildscripts/pdebuild -f org.eclipse.wst.common.fproj \
 	-d "emf gef"
 
@@ -80,9 +85,12 @@ unzip -q -o -d %{buildroot}%{install_loc}/org.eclipse.wst.common_ui.feature \
 %{install_loc}/org.eclipse.wst.common_core.feature
 %{install_loc}/org.eclipse.wst.server_core.feature
 %{install_loc}/org.eclipse.wst.common_ui.feature
-%doc features/org.eclipse.wst.common_core.feature/epl-v10.html
-%doc features/org.eclipse.wst.common_core.feature/license.html
+%doc features/org.eclipse.license/epl-v10.html
+%doc features/org.eclipse.license/license.html
 
 %changelog
+* Fri Sep 23 2011 Andrew Robinson <arobinso at redhat.com> 3.3.0-1
+- Update to WTP-common 3.3.0 release.
+
 * Fri Jun 10 2011 Andrew Robinson <arobinso at redhat.com> 3.2.4-1
 - Initial Fedora package
\ No newline at end of file
diff --git a/fetch-wtp-common-source.sh b/fetch-wtp-common-source.sh
index b26edc2..3be091d 100755
--- a/fetch-wtp-common-source.sh
+++ b/fetch-wtp-common-source.sh
@@ -3,17 +3,20 @@
 # eclipse-wtp-common SRPM produces one binary RPM including
 # the wtp common libraries
 # 
-RELEASE_TAG="R3_2_4"
-DOT_TAG="3.2.4"
+RELEASE_TAG="R3_3_0"
+DOT_TAG="3.3.0"
 
 rm -fr common
 # get sources from wtp-common repo
 cvs -d :pserver:anonymous at dev.eclipse.org:/cvsroot/webtools export -r ${RELEASE_TAG} common 
-cvs -d :pserver:anonymous at dev.eclipse.org:/cvsroot/webtools export -r R3_2_3  servertools/plugins/org.eclipse.wst.server.core
+cvs -d :pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse export -r R3_7_maintenance org.eclipse.sdk-feature
+mv org.eclipse.sdk-feature/features/org.eclipse.license common/features
+rm -rf org.eclipse.sdk-feature
+cvs -d :pserver:anonymous at dev.eclipse.org:/cvsroot/webtools export -r ${RELEASE_TAG}  servertools/plugins/org.eclipse.wst.server.core
 mv servertools/plugins/org.eclipse.wst.server.core common/plugins
-cvs -d :pserver:anonymous at dev.eclipse.org:/cvsroot/webtools export -r R3_2_3  servertools/plugins/org.eclipse.wst.internet.monitor.core
+cvs -d :pserver:anonymous at dev.eclipse.org:/cvsroot/webtools export -r ${RELEASE_TAG}  servertools/plugins/org.eclipse.wst.internet.monitor.core
 mv servertools/plugins/org.eclipse.wst.internet.monitor.core common/plugins
-cvs -d :pserver:anonymous at dev.eclipse.org:/cvsroot/webtools export -r R3_2_3  servertools/features/org.eclipse.wst.server_core.feature
+cvs -d :pserver:anonymous at dev.eclipse.org:/cvsroot/webtools export -r ${RELEASE_TAG}  servertools/features/org.eclipse.wst.server_core.feature
 mv servertools/features/org.eclipse.wst.server_core.feature common/features
 cvs -d :pserver:anonymous at dev.eclipse.org:/cvsroot/webtools export -r ${RELEASE_TAG} jeetools/plugins/org.eclipse.jst.common.frameworks
 mv jeetools/plugins/org.eclipse.jst.common.frameworks common/plugins
diff --git a/sources b/sources
index 4fac300..0aa74cd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-786ed27133b61ef5013e718024d566a0  eclipse-wtp-common-R3_2_4-fetched-src.tar.bz2
+31ae555ffd0719101fd2c14b105903cd  eclipse-wtp-common-R3_3_0-fetched-src.tar.bz2