rpms/eclipse-emf/devel .cvsignore, 1.4, 1.5 eclipse-emf.spec, 1.11, 1.12 get-emf.sh, 1.1, 1.2 sources, 1.5, 1.6

[Mat Booth]

Author: mbooth

Update of /cvs/pkgs/rpms/eclipse-emf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19355

Modified Files:
	.cvsignore eclipse-emf.spec get-emf.sh sources 
Log Message:
* Sat Feb 28 2009 Mat Booth <fedora at matbooth.co.uk> 2.4.2-1
- Update for Ganymede SR2.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-emf/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	6 Feb 2009 14:52:10 -0000	1.4
+++ .cvsignore	1 Mar 2009 11:32:46 -0000	1.5
@@ -1 +1 @@
-emf-2.4.1.tar.gz
+emf-2.4.2.tar.gz


Index: eclipse-emf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-emf/devel/eclipse-emf.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- eclipse-emf.spec	24 Feb 2009 13:43:46 -0000	1.11
+++ eclipse-emf.spec	1 Mar 2009 11:32:46 -0000	1.12
@@ -2,8 +2,8 @@
 %define eclipse_dropin   %{_datadir}/eclipse/dropins/emf
 
 Name:      eclipse-emf
-Version:   2.4.1
-Release:   5%{?dist}
+Version:   2.4.2
+Release:   1%{?dist}
 Summary:   Eclipse Modeling Framework (EMF) Eclipse plugin
 Group:     System Environment/Libraries
 License:   EPL
@@ -37,11 +37,11 @@
 BuildRequires:    java-devel >= 1:1.6.0
 BuildRequires:    java-javadoc
 BuildRequires:    jpackage-utils
-BuildRequires:    eclipse-pde >= 1:3.4.1
+BuildRequires:    eclipse-pde >= 1:3.4.2
 BuildRequires:    dos2unix
 Requires:         java
 Requires:         jpackage-utils
-Requires:         eclipse-platform >= 1:3.4.1
+Requires:         eclipse-platform >= 1:3.4.2
 
 # the standalone package was deprecated and removed in EMF 2.3 (see eclipse.org bug #191837)
 Obsoletes:        %{name}-standalone < %{version}
@@ -63,6 +63,7 @@
 %description sdk
 Documentation and source for the Eclipse Modeling Framework (EMF).
 
+#TODO: obselete sdo when galileo arrives
 %package   sdo
 Summary:   Service Data Objects (SDO) Eclipse plugin
 Group:     System Environment/Libraries
@@ -73,6 +74,7 @@
 which includes an architecture and API. It simplifies the J2EE data
 programming model and abstracts data in a service oriented architecture.
 
+#TODO: obselete sdo-sdk when galileo arrives
 %package   sdo-sdk
 Summary:   Eclipse SDO SDK
 Group:     System Environment/Libraries
@@ -148,7 +150,7 @@
 # build all features
 # we use forceContextQualifier because the docs plugins use custom build scripts and don't work otherwise
 %{eclipse_base}/buildscripts/pdebuild -f org.eclipse.emf.all \
-  -a "-DjavacTarget=1.5 -DjavacSource=1.5 -DforceContextQualifier=v200808251517"
+  -a "-DjavacTarget=1.5 -DjavacSource=1.5 -DforceContextQualifier=v200902171115"
 
 %install
 rm -rf %{buildroot}
@@ -304,6 +306,9 @@
 %{eclipse_dropin}/eclipse/plugins/org.eclipse.xsd.example_*
 
 %changelog
+* Sat Feb 28 2009 Mat Booth <fedora at matbooth.co.uk> 2.4.2-1
+- Update for Ganymede SR2.
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: get-emf.sh
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-emf/devel/get-emf.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- get-emf.sh	6 Feb 2009 14:54:12 -0000	1.1
+++ get-emf.sh	1 Mar 2009 11:32:46 -0000	1.2
@@ -1,7 +1,7 @@
 #!/bin/bash
 NAME="emf"
-VERSION=2.4.1
-TAG="R200808251517"
+VERSION=2.4.2
+TAG="R200902171115"
 
 echo "Exporting from CVS..."
 mkdir $NAME-$VERSION
@@ -9,7 +9,7 @@
 
 MAPFILE=$NAME.map
 TEMPMAPFILE=temp.map
-wget "http://download.eclipse.org/modeling/$NAME/$NAME/downloads/drops/$VERSION/$TAG/directory.txt" -O $MAPFILE
+wget "http://download.eclipse.org/modeling/emf/emf/downloads/drops/$VERSION/$TAG/directory.txt" -O $MAPFILE
 dos2unix $MAPFILE
 grep ^[a-z] $MAPFILE > $TEMPMAPFILE
 
@@ -22,14 +22,14 @@
 	split($1, version, "=");
 	split(version[1], directory, "@");
 	cvsdir=split($2, dirName, ":");
-	printf("%s %s %s%s %s %s %s %s %s %s %s\n", "cvs", "-d", ":pserver:anonymous at dev.eclipse.org:", dirName[cvsdir], "-q", "export", "-r", version[2], "-d", directory[2], directory[2]) | "/bin/bash";
+	printf("cvs -d %s%s %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("%s %s %s%s %s %s %s %s %s %s %s\n", "cvs", "-d", ":pserver:anonymous at dev.eclipse.org:", dirName[cvsdir], "-q", "export", "-r", version[2], "-d", directory[total], $4) | "/bin/bash";
+	printf("cvs -d %s%s %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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-emf/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	6 Feb 2009 14:52:10 -0000	1.5
+++ sources	1 Mar 2009 11:32:46 -0000	1.6
@@ -1 +1 @@
-a5ecc9810d4b59dfbd518476fa60c886  emf-2.4.1.tar.gz
+558e4476348a3ddf7942c91bebc048ce  emf-2.4.2.tar.gz