[eclipse-wtp-jst-web/f17] Update to R-3.4.0 Juno stable release

Gerard Ryan galileo at fedoraproject.org
Fri Jul 13 01:12:32 UTC 2012


commit 661340564bdcadb1d7ff1d742153b4da5eef7b31
Author: Gerard Ryan <gerard at ryan.lt>
Date:   Fri Jul 13 02:11:35 2012 +0100

    Update to R-3.4.0 Juno stable release

 .gitignore                             |    1 +
 eclipse-wtp-jst-web.spec               |   39 +++++++++++++------------
 fetch-eclipse-wtp-jst-web-using-map.sh |   50 ++++++++++++++++++++++++++++++++
 sources                                |    2 +-
 4 files changed, 72 insertions(+), 20 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 38110b6..81ab990 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /eclipse-wtp-jst-web-R3.4.0.tar.xz
+/eclipse-wtp-jst-web-3.4.0.tar.xz
diff --git a/eclipse-wtp-jst-web.spec b/eclipse-wtp-jst-web.spec
index c784421..ee9c7cf 100644
--- a/eclipse-wtp-jst-web.spec
+++ b/eclipse-wtp-jst-web.spec
@@ -3,7 +3,7 @@
 
 Name:		eclipse-wtp-jst-web
 Version:	3.4.0
-Release:	0.2.RC4%{?dist}
+Release:	1%{?dist}
 Summary:	Tools for working with JavaServer Pages (JSP)
 
 Group:		Development/Tools
@@ -13,7 +13,7 @@ License:	EPL and CDDL
 URL:		http://www.eclipse.org/webtools/
 
 # /usr/bin/bash -x fetch-eclipse-wtp-jst-web-using-map.sh
-Source0:	%{name}-R%{version}.tar.xz
+Source0:	%{name}-%{version}.tar.xz
 
 # These two patches just remove inclusion of features built in webservices
 Patch0:		%{name}-rm-wst.ws_ui-include.patch
@@ -21,39 +21,37 @@ Patch1:		%{name}-rm-wst.ws_core-include.patch
 
 BuildArch:	noarch
 
-BuildRequires:	java-devel
-BuildRequires:	jpackage-utils
-BuildRequires:	glibc-common
-BuildRequires:	glassfish-jsp-api >= 2.2.1
-
+BuildRequires:	eclipse-emf-core >= 1:2.8.0-0.22
+BuildRequires:	eclipse-jdt >= 1:4.2.0-0.22
 BuildRequires:	eclipse-pde >= 1:4.2.0-0.22
+BuildRequires:	eclipse-platform >= 1:4.2.0-0.22
 BuildRequires:	eclipse-rcp >= 1:4.2.0-0.22
 BuildRequires:	eclipse-swt >= 1:4.2.0-0.22
-BuildRequires:	eclipse-jdt >= 1:4.2.0-0.22
 BuildRequires:	eclipse-wtp-common >= 3.4.0
-BuildRequires:	icu4j-eclipse >= 1:4.4.2.2-11
 BuildRequires:	eclipse-wtp-jeetools >= 3.4.0
-BuildRequires:	eclipse-emf-core >= 1:2.8.0-0.22
-BuildRequires:	eclipse-platform >= 1:4.2.0-0.22
 BuildRequires:	eclipse-wtp-servertools >= 3.3.1-4
 BuildRequires:	eclipse-wtp-sourceediting >= 3.4.0
-BuildRequires:	eclipse-wtp-webservices >= 3.4.0-0.5
+BuildRequires:	eclipse-wtp-webservices >= 3.4.0-0.
+BuildRequires:	glibc-common
+BuildRequires:	glassfish-jsp-api >= 2.2.1
+BuildRequires:	icu4j-eclipse >= 1:4.4.2.2-11
+BuildRequires:	java-devel
+BuildRequires:	jpackage-utils
 
-Requires:	eclipse-rcp >= 1:4.2.0-0.22
-Requires:	eclipse-swt >= 1:4.2.0-0.22
 Requires:	eclipse-jdt >= 1:4.2.0-0.22
 Requires:	icu4j-eclipse >= 1:4.4.2.2-11
-Requires:	eclipse-wtp-jeetools >= 3.4.0
-Requires:	eclipse-wtp-common >= 3.4.0-0.1
 Requires:	eclipse-emf-core >= 1:2.8.0-0.22
 Requires:	eclipse-platform >= 1:4.2.0-0.22
+Requires:	eclipse-rcp >= 1:4.2.0-0.22
+Requires:	eclipse-swt >= 1:4.2.0-0.22
+Requires:	eclipse-wtp-common >= 3.4.0-0.1
+Requires:	eclipse-wtp-jeetools >= 3.4.0
 Requires:	eclipse-wtp-servertools >= 3.3.1-4
 Requires:	eclipse-wtp-sourceediting >= 3.4.0
 Requires:	eclipse-wtp-webservices >= 3.4.0-0.5
-
+Requires:	glassfish-jsp-api >= 2.2.1
 Requires:	java
 Requires:	jpackage-utils
-Requires:	glassfish-jsp-api >= 2.2.1
 
 
 %description
@@ -61,7 +59,7 @@ Eclipse tools for working with JavaServer Pages (JSP).
 
 
 %prep
-%setup -q -n %{name}-R%{version}
+%setup -q
 
 # Delete and possible prebuilt stuff
 find -type f -name *.jar -delete
@@ -116,6 +114,9 @@ popd
 %doc org.eclipse.jst.standard.schemas/about_files/CDDLv1.0.txt
 
 %changelog
+* Thu Jul 15 2012 Gerard Ryan <galileo at fedoraproject.org> 3.4.0-1
+- Update to R-3.4.0 Juno stable release
+
 * Thu Jul 05 2012 Gerard Ryan <galileo at fedoraproject.org> 3.4.0-0.2.RC4
 - Fix file encoding for license files
 - Add comment on how to generate source tarball
diff --git a/fetch-eclipse-wtp-jst-web-using-map.sh b/fetch-eclipse-wtp-jst-web-using-map.sh
new file mode 100755
index 0000000..ea5739c
--- /dev/null
+++ b/fetch-eclipse-wtp-jst-web-using-map.sh
@@ -0,0 +1,50 @@
+#!/usr/bin/bash
+set -e
+
+NAME="eclipse-wtp-jst-web"
+VERSION=3.4.0
+TAG=R-3.4.0-20120612174739
+
+echo "Exporting from CVS..."
+mkdir $NAME-$VERSION
+pushd $NAME-$VERSION >/dev/null
+
+MAPFILE=$NAME.map
+TEMPMAPFILE=temp.map
+wget "http://download.eclipse.org/webtools/downloads/drops/R${VERSION}/${TAG}/directory.txt" -O $MAPFILE 
+
+
+dos2unix $MAPFILE
+grep ^[a-z] $MAPFILE | grep -i "sourceediting" | grep -v "org.eclipse.wst" | grep -v "test" > $TEMPMAPFILE
+grep ^[a-z] $MAPFILE | grep -i "org.eclipse.jem.beaninfo" | grep -v "test" >> $TEMPMAPFILE
+grep ^[a-z] $MAPFILE | grep -i "org.eclipse.jst.jee.web" | grep -v "test" >> $TEMPMAPFILE
+grep ^[a-z] $MAPFILE | grep -i "org.eclipse.wst.jsdt.web.support.jsp" | grep -v "test" >> $TEMPMAPFILE
+grep ^[a-z] $MAPFILE | grep -i "org.eclipse.jst.common.annotations.ui" | grep -v "test" >> $TEMPMAPFILE
+grep ^[a-z] $MAPFILE | grep -i "org.eclipse.jst.jsf.doc.user" | grep -v "test" >> $TEMPMAPFILE
+
+gawk 'BEGIN {
+        FS=","
+}
+{
+if (NF <  4) {
+
+        split($1, version, "=");
+        split(version[1], directory, "@");
+        cvsdir=split($2, dirName, ":");
+        printf("cvs -d %s%s %s %s %s %s %s\n", ":pserver:anonymous at dev.eclipse.org:", dirName[cvsdir], "-q export -r", version[2], "-d", directory[2], directory[2]) | "/bin/bash";
+}
+else {
+
+        split($1, version, "=");
+        total=split($4, directory, "/");
+        cvsdir=split($2, dirName, ":");
+        printf("cvs -d %s%s %s %s %s %s %s\n", ":pserver:anonymous at dev.eclipse.org:", dirName[cvsdir], "-q export -r", version[2], "-d", directory[total], $4) | "/bin/bash";
+}
+
+}' $TEMPMAPFILE
+
+rm $TEMPMAPFILE $MAPFILE
+popd >/dev/null
+
+echo "Creating tarball '$NAME-$VERSION.tar.xz'..."
+tar -cJf $NAME-$VERSION.tar.xz $NAME-$VERSION
diff --git a/sources b/sources
index 2d47bcb..9e7cfd7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1f579a783b532438bdf7152977e3875b  eclipse-wtp-jst-web-R3.4.0.tar.xz
+a44f8ae064364950593287ce374314a3  eclipse-wtp-jst-web-3.4.0.tar.xz


More information about the scm-commits mailing list