[eclipse-wtp-servertools] Update to latest upstream release.
Krzysztof Daniel
kdaniel at fedoraproject.org
Thu Jul 12 10:05:52 UTC 2012
commit a4414c02f98433c9ba4172cf4ff2c04bdee4244f
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date: Wed Jul 11 14:52:41 2012 +0200
Update to latest upstream release.
.gitignore | 3 +++
eclipse-wtp-servertools.spec | 30 +++++++++++++-----------------
fetch-wtp-servertools.sh | 6 +++---
sources | 2 +-
4 files changed, 20 insertions(+), 21 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b7737c1..3dd0aba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,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
diff --git a/eclipse-wtp-servertools.spec b/eclipse-wtp-servertools.spec
index 74ddfa6..5b40f8b 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.3.1
-Release: 4%{?dist}
+Version: 3.4.0
+Release: 1%{?dist}
Summary: WTP Server Tools
Group: Development/Tools
@@ -16,7 +16,7 @@ Source1: fetch-wtp-servertools.sh
BuildArch: noarch
BuildRequires: eclipse-platform >= 1:3.8.0
-BuildRequires: eclipse-pde >= 1:3.8.0
+BuildRequires: eclipse-pde >= 1:4.2.0-6
BuildRequires: eclipse-emf >= 2.6.0
BuildRequires: eclipse-wtp-common >= 3.3.1
BuildRequires: eclipse-gef
@@ -38,24 +38,17 @@ server components.
find -name feature.xml -exec sed -i -e 's/license-feature.*"//' '{}' \;
%build
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.wst.server_ui.feature \
- -d "org.eclipse.wst.server_core.feature
- org.eclipse.wst.common_core.feature
- org.eclipse.wst.common.fproj
- org.eclipse.wst.common_ui.feature"
+eclipse-pdebuild -f org.eclipse.wst.server_ui.feature \
+ -d "emf gef eclipse-wtp-common"
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.jst.server_ui.feature \
- -d "emf
- org.eclipse.wst.server_core.feature
- org.eclipse.wst.common_core.feature
- org.eclipse.wst.common.fproj
- org.eclipse.jst.common.fproj.enablement.jdt"
+eclipse-pdebuild -f org.eclipse.jst.server_ui.feature \
+ -d "emf gef eclipse-wtp-common"
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.wst.server_adapters.feature -d "gef"
+eclipse-pdebuild -f org.eclipse.wst.server_adapters.feature -d "gef"
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.jst.server_adapters.feature
+eclipse-pdebuild -f org.eclipse.jst.server_adapters.feature
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.jst.server_adapters.ext.feature
+eclipse-pdebuild -f org.eclipse.jst.server_adapters.ext.feature
%install
install -d -m 755 %{buildroot}%{install_loc}/org.eclipse.jst.server_ui.feature
@@ -92,6 +85,9 @@ popd
%doc docs/org.eclipse.jst.server.ui.doc.user/about.html
%changelog
+* Wed Jul 11 2012 Krzysztof Daniel <kdaniel at redhat.com> 3.4.0-1
+- Update to latest upstream release.
+
* Fri Feb 10 2012 vladimir <vladimir at dev.technogamma.biz> 3.3.1-4
- Source tarball patched so it complies with Jetty 8 & javax.servlet 3.0
diff --git a/fetch-wtp-servertools.sh b/fetch-wtp-servertools.sh
index 8ecea25..f90c405 100755
--- a/fetch-wtp-servertools.sh
+++ b/fetch-wtp-servertools.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-RELEASE_TAG="R3_3_1"
-DOT_TAG="3.3.1"
+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"
@@ -15,7 +15,7 @@ cvs -d :pserver:anonymous at dev.eclipse.org:/cvsroot/webtools export -r ${RELEASE_
# Fix Jetty & javax.servlet dependecies
rm -rf ${PATCH_PLUGIN}
-cvs -d :pserver:anonymous at dev.eclipse.org:/cvsroot/webtools export -r v20111212_1019 ${PATCH_PLUGIN}
+cvs -d :pserver:anonymous at dev.eclipse.org:/cvsroot/webtools export -r ${RELEASE_TAG} ${PATCH_PLUGIN}
pushd ${MODULE}
# Cleanup the checkout
diff --git a/sources b/sources
index f35dd5e..2c55388 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-62973480123ae54d6715bf061c39bb6b eclipse-wtp-servertools-3.3.1-fetched-src.tar.bz2
+9ed35e183cabad918dad070fe4d75911 eclipse-wtp-servertools-3.4.0-fetched-src.tar.bz2
More information about the scm-commits
mailing list