rpms/eclipse-emf/devel eclipse-emf-platform-docs-location.patch, 1.1, 1.2 .cvsignore, 1.5, 1.6 eclipse-emf.spec, 1.15, 1.16 sources, 1.6, 1.7 get-emf.sh, 1.2, 1.3 eclipse-emf-symlinked-classpath.patch, 1.1, 1.2 eclipse-emf-make-homeless.patch, 1.1, 1.2

Mat Booth mbooth at fedoraproject.org
Sat Apr 18 20:48:20 UTC 2009 

Author: mbooth

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

Modified Files:
	eclipse-emf-platform-docs-location.patch .cvsignore 
	eclipse-emf.spec sources get-emf.sh 
	eclipse-emf-symlinked-classpath.patch 
	eclipse-emf-make-homeless.patch 
Log Message:
* Sat Apr 18 2009 Mat Booth <fedora at matbooth.co.uk> 2.5.0-0.1.M6
- Update to Milestone 6 release of 2.5.0.
- Require Eclipse 3.5.0.


eclipse-emf-platform-docs-location.patch:

Index: eclipse-emf-platform-docs-location.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-emf/devel/eclipse-emf-platform-docs-location.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eclipse-emf-platform-docs-location.patch	6 Feb 2009 14:54:12 -0000	1.1
+++ eclipse-emf-platform-docs-location.patch	18 Apr 2009 20:48:20 -0000	1.2
@@ -1,5 +1,5 @@
---- emf-2.4.1/org.eclipse.emf.doc/build/javadoc.xml.template	2008-12-11 15:46:37.000000000 +0000
-+++ emf-2.4.1/org.eclipse.emf.doc/build/javadoc.xml.template	2008-12-11 16:11:50.000000000 +0000
+--- org.eclipse.emf.doc/build/javadoc.xml.template	2008-12-11 15:46:37.000000000 +0000
++++ org.eclipse.emf.doc/build/javadoc.xml.template	2008-12-11 16:11:50.000000000 +0000
 @@ -12,7 +12,7 @@
  	<available property="platformJavadocExists" file="${javadoc.link.location}/platform/"/>
  
@@ -9,19 +9,8 @@
  	</target>
  	
  	<target name="javadoc" depends="extractPlatformJavadoc">
---- emf-2.4.1/org.eclipse.emf.ecore.sdo.doc/build/javadoc.xml.template	2008-12-11 15:46:37.000000000 +0000
-+++ emf-2.4.1/org.eclipse.emf.ecore.sdo.doc/build/javadoc.xml.template	2008-12-11 16:11:50.000000000 +0000
-@@ -12,7 +12,7 @@
- 	<available property="platformJavadocExists" file="${javadoc.link.location}/platform/"/>
- 
- 	<target name="extractPlatformJavadoc" unless="platformJavadocExists">
--		<unzip src="${eclipseDir}/plugins/org.eclipse.platform.doc.isv.jar" dest="${javadoc.link.location}/platform/"/>
-+		<unzip dest="${javadoc.link.location}/platform/"><fileset dir="${eclipseDir}/SDK/plugins"><include name="org.eclipse.platform.doc.isv_*.jar"/></fileset></unzip>
- 	</target>
- 	
- 	<target name="javadoc" depends="extractPlatformJavadoc">
---- emf-2.4.1/org.eclipse.xsd.doc/build/javadoc.xml.template	2008-12-11 15:46:37.000000000 +0000
-+++ emf-2.4.1/org.eclipse.xsd.doc/build/javadoc.xml.template	2008-12-11 16:11:50.000000000 +0000
+--- org.eclipse.xsd.doc/build/javadoc.xml.template	2008-12-11 15:46:37.000000000 +0000
++++ org.eclipse.xsd.doc/build/javadoc.xml.template	2008-12-11 16:11:50.000000000 +0000
 @@ -12,7 +12,7 @@
  	<available property="platformJavadocExists" file="${javadoc.link.location}/platform/"/>
  


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-emf/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	1 Mar 2009 11:32:46 -0000	1.5
+++ .cvsignore	18 Apr 2009 20:48:20 -0000	1.6
@@ -1 +1 @@
-emf-2.4.2.tar.gz
+emf-2.5.0.tar.gz


Index: eclipse-emf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-emf/devel/eclipse-emf.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- eclipse-emf.spec	7 Apr 2009 13:07:20 -0000	1.15
+++ eclipse-emf.spec	18 Apr 2009 20:48:20 -0000	1.16
@@ -1,9 +1,9 @@
 %define eclipse_base     %{_libdir}/eclipse
-%define eclipse_dropin   %{_datadir}/eclipse/dropins/emf
+%define eclipse_dropin   %{_datadir}/eclipse/dropins
 
 Name:      eclipse-emf
-Version:   2.4.2
-Release:   3%{?dist}
+Version:   2.5.0
+Release:   0.1.M6%{?dist}
 Summary:   Eclipse Modeling Framework (EMF) Eclipse plugin
 Group:     System Environment/Libraries
 License:   EPL
@@ -37,14 +37,18 @@
 BuildRequires:    java-devel >= 1:1.6.0
 BuildRequires:    java-javadoc
 BuildRequires:    jpackage-utils
-BuildRequires:    eclipse-pde >= 1:3.4.2
+BuildRequires:    eclipse-pde >= 1:3.5.0
 BuildRequires:    dos2unix
 Requires:         java
 Requires:         jpackage-utils
-Requires:         eclipse-platform >= 1:3.4.2
+Requires:         eclipse-platform >= 1:3.5.0
 
 # the standalone package was deprecated and removed in EMF 2.3 (see eclipse.org bug #191837)
-Obsoletes:        %{name}-standalone < %{version}
+Obsoletes:        %{name}-standalone < 2.4
+
+# the SDO sub-project was terminated upstream and removed in EMF 2.5 (see eclipse.org bug #251402)
+Obsoletes:        %{name}-sdo < 2.5
+Obsoletes:        %{name}-sdo-sdk < 2.5
 
 %description
 The Eclipse Modeling Framework (EMF) allows developers to build tools and
@@ -63,27 +67,6 @@
 %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
-Requires:  %{name} = %{version}-%{release}
-
-%description sdo
-Service Data Objects (SDO) is a framework for data application development,
-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
-Requires:  %{name}-sdo = %{version}-%{release}
-Requires:  %{name}-sdk = %{version}-%{release}
-
-%description sdo-sdk
-Documentation and source for the Eclipse Service Data Objects (SDO) plugin.
-
 %package   xsd
 Summary:   XML Schema Definition (XSD) Eclipse plugin
 Group:     System Environment/Libraries
@@ -119,9 +102,9 @@
 %prep
 %setup -q -n emf-%{version}
 
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
+%patch0 -p0
+%patch1 -p0
+%patch2 -p0
 %patch3 -p1
 %patch4 -p1
 
@@ -131,7 +114,6 @@
 # link to local java api javadocs
 sed -i -e "s|http://java.sun.com/j2se/1.5/docs/api/|%{_javadocdir}/java|" -e "s|\${javaHome}/docs/api/|%{_javadocdir}/java|" \
   org.eclipse.emf.doc/build/javadoc.xml.template \
-  org.eclipse.emf.ecore.sdo.doc/build/javadoc.xml.template \
   org.eclipse.xsd.doc/build/javadoc.xml.template
 
 # make sure upstream hasn't sneaked in any jars we don't know about
@@ -150,165 +132,143 @@
 # 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=v200902171115"
+  -a "-DjavacTarget=1.5 -DjavacSource=1.5 -DforceContextQualifier=v200903161215"
 
 %install
 rm -rf %{buildroot}
 install -d -m 755 %{buildroot}%{eclipse_dropin}
-unzip -q -d %{buildroot}%{eclipse_dropin} build/rpmBuild/org.eclipse.emf.all.zip
+unzip -q -d %{buildroot}%{eclipse_dropin}/emf build/rpmBuild/org.eclipse.emf.all.zip
 
 %clean
 rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%dir %{eclipse_dropin}
-%dir %{eclipse_dropin}/eclipse
-%dir %{eclipse_dropin}/eclipse/features
-%dir %{eclipse_dropin}/eclipse/plugins
-%doc %{eclipse_dropin}/eclipse/epl-v10.html
-%doc %{eclipse_dropin}/eclipse/notice.html
-#%{eclipse_dropin}/eclipse/content.xml
-%{eclipse_dropin}/eclipse/features/org.eclipse.emf_*
-%{eclipse_dropin}/eclipse/features/org.eclipse.emf.codegen_*
-%{eclipse_dropin}/eclipse/features/org.eclipse.emf.codegen.ui_*
-%{eclipse_dropin}/eclipse/features/org.eclipse.emf.codegen.ecore_*
-%{eclipse_dropin}/eclipse/features/org.eclipse.emf.codegen.ecore.ui_*
-%{eclipse_dropin}/eclipse/features/org.eclipse.emf.common_*
-%{eclipse_dropin}/eclipse/features/org.eclipse.emf.common.ui_*
-%{eclipse_dropin}/eclipse/features/org.eclipse.emf.converter_*
-%{eclipse_dropin}/eclipse/features/org.eclipse.emf.databinding_*
-%{eclipse_dropin}/eclipse/features/org.eclipse.emf.databinding.edit_*
-%{eclipse_dropin}/eclipse/features/org.eclipse.emf.ecore_*
-%{eclipse_dropin}/eclipse/features/org.eclipse.emf.ecore.edit_*
-%{eclipse_dropin}/eclipse/features/org.eclipse.emf.ecore.editor_*
-%{eclipse_dropin}/eclipse/features/org.eclipse.emf.edit_*
-%{eclipse_dropin}/eclipse/features/org.eclipse.emf.edit.ui_*
-%{eclipse_dropin}/eclipse/features/org.eclipse.emf.mapping_*
-%{eclipse_dropin}/eclipse/features/org.eclipse.emf.mapping.ui_*
-%{eclipse_dropin}/eclipse/features/org.eclipse.emf.mapping.ecore_*
-%{eclipse_dropin}/eclipse/features/org.eclipse.emf.mapping.ecore.editor_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.ant_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.codegen_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.codegen.ui_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.codegen.ecore_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.codegen.ecore.ui_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.common_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.common.ui_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.converter_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.databinding_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.databinding.edit_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.ecore_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.ecore.change_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.ecore.change.edit_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.ecore.edit_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.ecore.editor_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.ecore.xmi_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.edit_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.edit.ui_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.exporter_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.importer_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.importer.ecore_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.importer.java_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.importer.rose_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.mapping_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.mapping.ui_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.mapping.ecore_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.mapping.ecore.editor_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.mapping.ecore2ecore_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.mapping.ecore2ecore.editor_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.mapping.ecore2xml_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.mapping.ecore2xml.ui_*
+%dir %{eclipse_dropin}/emf
+%dir %{eclipse_dropin}/emf/eclipse
+%dir %{eclipse_dropin}/emf/eclipse/features
+%dir %{eclipse_dropin}/emf/eclipse/plugins
+%doc org.eclipse.emf-feature/rootfiles/*
+%{eclipse_dropin}/emf/eclipse/epl-v10.html
+%{eclipse_dropin}/emf/eclipse/notice.html
+%{eclipse_dropin}/emf/eclipse/features/org.eclipse.emf_*
+%{eclipse_dropin}/emf/eclipse/features/org.eclipse.emf.codegen_*
+%{eclipse_dropin}/emf/eclipse/features/org.eclipse.emf.codegen.ui_*
+%{eclipse_dropin}/emf/eclipse/features/org.eclipse.emf.codegen.ecore_*
+%{eclipse_dropin}/emf/eclipse/features/org.eclipse.emf.codegen.ecore.ui_*
+%{eclipse_dropin}/emf/eclipse/features/org.eclipse.emf.common_*
+%{eclipse_dropin}/emf/eclipse/features/org.eclipse.emf.common.ui_*
+%{eclipse_dropin}/emf/eclipse/features/org.eclipse.emf.converter_*
+%{eclipse_dropin}/emf/eclipse/features/org.eclipse.emf.databinding_*
+%{eclipse_dropin}/emf/eclipse/features/org.eclipse.emf.databinding.edit_*
+%{eclipse_dropin}/emf/eclipse/features/org.eclipse.emf.ecore_*
+%{eclipse_dropin}/emf/eclipse/features/org.eclipse.emf.ecore.edit_*
+%{eclipse_dropin}/emf/eclipse/features/org.eclipse.emf.ecore.editor_*
+%{eclipse_dropin}/emf/eclipse/features/org.eclipse.emf.edit_*
+%{eclipse_dropin}/emf/eclipse/features/org.eclipse.emf.edit.ui_*
+%{eclipse_dropin}/emf/eclipse/features/org.eclipse.emf.mapping_*
+%{eclipse_dropin}/emf/eclipse/features/org.eclipse.emf.mapping.ui_*
+%{eclipse_dropin}/emf/eclipse/features/org.eclipse.emf.mapping.ecore_*
+%{eclipse_dropin}/emf/eclipse/features/org.eclipse.emf.mapping.ecore.editor_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.ant_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.codegen_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.codegen.ui_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.codegen.ecore_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.codegen.ecore.ui_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.common_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.common.ui_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.converter_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.databinding_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.databinding.edit_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.ecore_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.ecore.change_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.ecore.change.edit_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.ecore.edit_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.ecore.editor_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.ecore.xmi_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.edit_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.edit.ui_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.exporter_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.importer_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.importer.ecore_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.importer.java_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.importer.rose_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.mapping_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.mapping.ui_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.mapping.ecore_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.mapping.ecore.editor_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.mapping.ecore2ecore_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.mapping.ecore2ecore.editor_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.mapping.ecore2xml_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.mapping.ecore2xml.ui_*
 
 %files sdk
 %defattr(-,root,root,-)
-%doc %{eclipse_dropin}/eclipse/epl-v10.html
-%doc %{eclipse_dropin}/eclipse/notice.html
-%{eclipse_dropin}/eclipse/features/org.eclipse.emf.doc_*
-%{eclipse_dropin}/eclipse/features/org.eclipse.emf.sdk_*
-%{eclipse_dropin}/eclipse/features/org.eclipse.emf.source_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.cheatsheets_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.doc_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.source_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.example.installer_*
-
-%files sdo
-%defattr(-,root,root,-)
-%doc %{eclipse_dropin}/eclipse/epl-v10.html
-%doc %{eclipse_dropin}/eclipse/notice.html
-%{eclipse_dropin}/eclipse/features/org.eclipse.emf.ecore.sdo_*
-%{eclipse_dropin}/eclipse/features/org.eclipse.emf.ecore.sdo.edit_*
-%{eclipse_dropin}/eclipse/features/org.eclipse.emf.ecore.sdo.editor_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.commonj.sdo_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.ecore.sdo_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.ecore.sdo.edit_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.ecore.sdo.editor_*
-
-%files sdo-sdk
-%defattr(-,root,root,-)
-%doc %{eclipse_dropin}/eclipse/epl-v10.html
-%doc %{eclipse_dropin}/eclipse/notice.html
-%{eclipse_dropin}/eclipse/features/org.eclipse.emf.ecore.sdo.doc_*
-%{eclipse_dropin}/eclipse/features/org.eclipse.emf.ecore.sdo.sdk_*
-%{eclipse_dropin}/eclipse/features/org.eclipse.emf.ecore.sdo.source_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.ecore.sdo.doc_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.ecore.sdo.source_*
+%doc org.eclipse.emf.sdk-feature/rootfiles/*
+%{eclipse_dropin}/emf/eclipse/features/org.eclipse.emf.doc_*
+%{eclipse_dropin}/emf/eclipse/features/org.eclipse.emf.sdk_*
+%{eclipse_dropin}/emf/eclipse/features/org.eclipse.emf.source_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.cheatsheets_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.doc_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.source_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.example.installer_*
 
 %files xsd
 %defattr(-,root,root,-)
-%doc %{eclipse_dropin}/eclipse/epl-v10.html
-%doc %{eclipse_dropin}/eclipse/notice.html
-%{eclipse_dropin}/eclipse/features/org.eclipse.xsd_*
-%{eclipse_dropin}/eclipse/features/org.eclipse.xsd.ecore.converter_*
-%{eclipse_dropin}/eclipse/features/org.eclipse.xsd.edit_*
-%{eclipse_dropin}/eclipse/features/org.eclipse.xsd.editor_*
-%{eclipse_dropin}/eclipse/features/org.eclipse.xsd.mapping_*
-%{eclipse_dropin}/eclipse/features/org.eclipse.xsd.mapping.editor_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.mapping.xsd2ecore_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.mapping.xsd2ecore.editor_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.xsd_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.xsd.ecore.converter_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.xsd.ecore.exporter_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.xsd.ecore.importer_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.xsd.edit_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.xsd.editor_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.xsd.mapping_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.xsd.mapping.editor_*
+%doc org.eclipse.xsd-feature/rootfiles/*
+%{eclipse_dropin}/emf/eclipse/features/org.eclipse.xsd_*
+%{eclipse_dropin}/emf/eclipse/features/org.eclipse.xsd.ecore.converter_*
+%{eclipse_dropin}/emf/eclipse/features/org.eclipse.xsd.edit_*
+%{eclipse_dropin}/emf/eclipse/features/org.eclipse.xsd.editor_*
+%{eclipse_dropin}/emf/eclipse/features/org.eclipse.xsd.mapping_*
+%{eclipse_dropin}/emf/eclipse/features/org.eclipse.xsd.mapping.editor_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.mapping.xsd2ecore_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.mapping.xsd2ecore.editor_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.xsd_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.xsd.ecore.converter_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.xsd.ecore.exporter_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.xsd.ecore.importer_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.xsd.edit_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.xsd.editor_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.xsd.mapping_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.xsd.mapping.editor_*
 
 %files xsd-sdk
 %defattr(-,root,root,-)
-%doc %{eclipse_dropin}/eclipse/epl-v10.html
-%doc %{eclipse_dropin}/eclipse/notice.html
-%{eclipse_dropin}/eclipse/features/org.eclipse.xsd.doc_*
-%{eclipse_dropin}/eclipse/features/org.eclipse.xsd.sdk_*
-%{eclipse_dropin}/eclipse/features/org.eclipse.xsd.source_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.xsd.cheatsheets_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.xsd.doc_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.xsd.source_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.xsd.example.installer_*
+%doc org.eclipse.xsd.sdk-feature/rootfiles/*
+%{eclipse_dropin}/emf/eclipse/features/org.eclipse.xsd.doc_*
+%{eclipse_dropin}/emf/eclipse/features/org.eclipse.xsd.sdk_*
+%{eclipse_dropin}/emf/eclipse/features/org.eclipse.xsd.source_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.xsd.cheatsheets_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.xsd.doc_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.xsd.source_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.xsd.example.installer_*
 
 %files examples
 %defattr(-,root,root,-)
-%doc %{eclipse_dropin}/eclipse/epl-v10.html
-%doc %{eclipse_dropin}/eclipse/notice.html
-%{eclipse_dropin}/eclipse/features/org.eclipse.emf.all_*
-%{eclipse_dropin}/eclipse/features/org.eclipse.emf.examples_*
-%{eclipse_dropin}/eclipse/features/org.eclipse.emf.examples.source_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.activities_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.examples_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.examples.generator.validator_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.examples.library_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.examples.library.edit_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.examples.library.editor_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.examples.source_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.exporter.html_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.java_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.java.edit_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.java.editor_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.xsd.example_*
+%doc org.eclipse.emf.examples-feature/rootfiles/*
+%{eclipse_dropin}/emf/eclipse/features/org.eclipse.emf.all_*
+%{eclipse_dropin}/emf/eclipse/features/org.eclipse.emf.examples_*
+%{eclipse_dropin}/emf/eclipse/features/org.eclipse.emf.examples.source_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.activities_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.examples_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.examples.generator.validator_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.examples.library_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.examples.library.edit_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.examples.library.editor_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.examples.source_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.exporter.html_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.java_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.java.edit_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.java.editor_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.xsd.example_*
 
 %changelog
+* Sat Apr 18 2009 Mat Booth <fedora at matbooth.co.uk> 2.5.0-0.1.M6
+- Update to Milestone 6 release of 2.5.0.
+- Require Eclipse 3.5.0.
+
 * Tue Apr 7 2009 Alexander Kurtakov <akurtako at redhat.com> 2.4.2-3
 - Fix directory ownership.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-emf/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	1 Mar 2009 11:32:46 -0000	1.6
+++ sources	18 Apr 2009 20:48:20 -0000	1.7
@@ -1 +1 @@
-558e4476348a3ddf7942c91bebc048ce  emf-2.4.2.tar.gz
+ac16602e3acf59cec2abb60467c7a45d  emf-2.5.0.tar.gz


Index: get-emf.sh
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-emf/devel/get-emf.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- get-emf.sh	1 Mar 2009 11:32:46 -0000	1.2
+++ get-emf.sh	18 Apr 2009 20:48:20 -0000	1.3
@@ -1,7 +1,7 @@
 #!/bin/bash
 NAME="emf"
-VERSION=2.4.2
-TAG="R200902171115"
+VERSION=2.5.0
+TAG="S200903161215"
 
 echo "Exporting from CVS..."
 mkdir $NAME-$VERSION

eclipse-emf-symlinked-classpath.patch:

Index: eclipse-emf-symlinked-classpath.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-emf/devel/eclipse-emf-symlinked-classpath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eclipse-emf-symlinked-classpath.patch	6 Feb 2009 14:54:12 -0000	1.1
+++ eclipse-emf-symlinked-classpath.patch	18 Apr 2009 20:48:20 -0000	1.2
@@ -1,5 +1,5 @@
---- emf-2.4.1/org.eclipse.emf.doc/build/antJavadoc.sh.old	2008-12-12 19:35:20.000000000 +0000
-+++ emf-2.4.1/org.eclipse.emf.doc/build/antJavadoc.sh	2008-12-12 19:36:10.000000000 +0000
+--- org.eclipse.emf.doc/build/antJavadoc.sh.old	2009-04-18 16:39:29.000000000 +0100
++++ org.eclipse.emf.doc/build/antJavadoc.sh	2009-04-18 16:44:38.000000000 +0100
 @@ -94,13 +94,13 @@
  # The directory of the plugins in the order they were built
  excludes="resources.jar";
@@ -7,7 +7,7 @@
 -pluginDirs=`find $eclipseDir/plugins -name @dot -printf '%T@ %p\n' | sort -n | egrep "$includes" | egrep -v "$excludes" | cut -f2 -d' ' | sed -e 's/\(\/.*\)\/.*/\1/'`
 +pluginDirs=`find -L $eclipseDir/plugins -name @dot -printf '%T@ %p\n' | sort -n | egrep "$includes" | egrep -v "$excludes" | cut -f2 -d' ' | sed -e 's/\(\/.*\)\/.*/\1/'`
  
- ### TODO: missing emf/sdo/xsd plugins (?) in $eclipseDir - need to copy them over or reference source (?)
+ ### TODO: missing emf/xsd plugins (?) in $eclipseDir - need to copy them over or reference source (?)
  ### so that all classes/packages (and thus @links) can be resolved
  
  # All the jars in the plugins directory
@@ -16,26 +16,8 @@
  if [[ $debug -gt 1 ]]; then echo "Got classpath: "; echo $classpath | perl -pe "s#:#\n\t:#g"; fi
  
  # Calculates the packagesets and the calls to copyDocFiles (used in ${antScript}.template)
---- emf-2.4.1/org.eclipse.emf.ecore.sdo.doc/build/antJavadoc.sh.old	2008-12-12 19:35:20.000000000 +0000
-+++ emf-2.4.1/org.eclipse.emf.ecore.sdo.doc/build/antJavadoc.sh	2008-12-12 19:38:27.000000000 +0000
-@@ -71,13 +71,13 @@
- # The directory of the plugins in the order they were built
- excludes="resources.jar";
- includes="org.eclipse.emf.ecore.sdo|org.eclipse.emf.commonj.sdo";
--pluginDirs=`find $eclipseDir/plugins -name @dot -printf '%T@ %p\n' | sort -n | egrep "$includes" | egrep -v "$excludes" | cut -f2 -d' ' | sed -e 's/\(\/.*\)\/.*/\1/'`
-+pluginDirs=`find -L $eclipseDir/plugins -name @dot -printf '%T@ %p\n' | sort -n | egrep "$includes" | egrep -v "$excludes" | cut -f2 -d' ' | sed -e 's/\(\/.*\)\/.*/\1/'`
- 
- ### TODO: missing emf/sdo/xsd plugins (?) in $eclipseDir - need to copy them over or reference source (?)
- ### so that all classes/packages (and thus @links) can be resolved
- 
- # All the jars in the plugins directory
--classpath=`find $eclipseDir/plugins \( -name "*.jar" -type f \) -o \( -name '@dot' -type d \) | tr '\n' ':'`; 
-+classpath=`find -L $eclipseDir/plugins $eclipseDir/SDK/plugins \( -name "*.jar" -type f \) -o \( -name '@dot' -type d \) | tr '\n' ':'`; 
- if [[ $debug -gt 1 ]]; then echo "Got classpath: "; echo $classpath | perl -pe "s#:#\n\t:#g"; fi
- 
- # Calculates the packagesets and the calls to copyDocFiles (used in ${antScript}.template)
---- emf-2.4.1/org.eclipse.xsd.doc/build/antJavadoc.sh.old	2008-12-12 19:40:53.000000000 +0000
-+++ emf-2.4.1/org.eclipse.xsd.doc/build/antJavadoc.sh	2008-12-12 19:41:08.000000000 +0000
+--- org.eclipse.xsd.doc/build/antJavadoc.sh.old	2009-04-18 16:39:29.000000000 +0100
++++ org.eclipse.xsd.doc/build/antJavadoc.sh	2009-04-18 16:51:42.000000000 +0100
 @@ -72,13 +72,13 @@
  # The directory of the plugins in the order they were built
  excludes="resources.jar";
@@ -43,7 +25,7 @@
 -pluginDirs=`find $eclipseDir/plugins -name @dot -printf '%T@ %p\n' | sort -n | egrep "$includes" | egrep -v "$excludes" | cut -f2 -d' ' | sed -e 's/\(\/.*\)\/.*/\1/'`
 +pluginDirs=`find -L $eclipseDir/plugins -name @dot -printf '%T@ %p\n' | sort -n | egrep "$includes" | egrep -v "$excludes" | cut -f2 -d' ' | sed -e 's/\(\/.*\)\/.*/\1/'`
  
- ### TODO: missing emf/sdo/xsd plugins (?) in $eclipseDir - need to copy them over or reference source (?)
+ ### TODO: missing emf/xsd plugins (?) in $eclipseDir - need to copy them over or reference source (?)
  ### so that all classes/packages (and thus @links) can be resolved
  
  # All the jars in the plugins directory

eclipse-emf-make-homeless.patch:

Index: eclipse-emf-make-homeless.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-emf/devel/eclipse-emf-make-homeless.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eclipse-emf-make-homeless.patch	6 Feb 2009 14:54:12 -0000	1.1
+++ eclipse-emf-make-homeless.patch	18 Apr 2009 20:48:20 -0000	1.2
@@ -1,5 +1,5 @@
---- emf-2.4.1/org.eclipse.emf.doc/build/antJavadoc.sh	2008-12-11 15:39:07.000000000 +0000
-+++ emf-2.4.1/org.eclipse.emf.doc/build/antJavadoc.sh	2008-12-11 15:39:30.000000000 +0000
+--- org.eclipse.emf.doc/build/antJavadoc.sh	2008-12-11 15:39:07.000000000 +0000
++++ org.eclipse.emf.doc/build/antJavadoc.sh	2008-12-11 15:39:30.000000000 +0000
 @@ -12,9 +12,9 @@
  
  debug=0; if [[ $debug -gt 0 ]]; then echo "[antJd] debug: "$debug; fi
@@ -13,23 +13,8 @@
  
  # current directory - all but the name of this script, no trailing slash
  currentPath=$PWD"/"$0; currentPath=${currentPath%/*}; if [[ $debug -gt 0 ]]; then echo "[antJd] currentPath: "$currentPath; fi
---- emf-2.4.1/org.eclipse.emf.ecore.sdo.doc/build/antJavadoc.sh	2008-12-11 16:39:38.000000000 +0000
-+++ emf-2.4.1/org.eclipse.emf.ecore.sdo.doc/build/antJavadoc.sh	2008-12-11 16:40:04.000000000 +0000
-@@ -12,9 +12,9 @@
- 
- debug=0; if [[ $debug -gt 0 ]]; then echo "[antJd] debug: "$debug; fi
- 
--if [ "x"$ANT_HOME = "x" ]; then export ANT_HOME=/opt/apache-ant-1.6; fi
--if [ "x"$JAVA_HOME = "x" ]; then export JAVA_HOME=/opt/ibm-java2-1.4; fi
--export PATH=${PATH}:${ANT_HOME}/bin
-+#if [ "x"$ANT_HOME = "x" ]; then export ANT_HOME=/opt/apache-ant-1.6; fi
-+#if [ "x"$JAVA_HOME = "x" ]; then export JAVA_HOME=/opt/ibm-java2-1.4; fi
-+#export PATH=${PATH}:${ANT_HOME}/bin
- 
- # current directory - all but the name of this script, no trailing slash
- currentPath=$PWD"/"$0; currentPath=${currentPath%/*}; if [[ $debug -gt 0 ]]; then echo "[antJd] currentPath: "$currentPath; fi
---- emf-2.4.1/org.eclipse.xsd.doc/build/antJavadoc.sh	2008-12-11 16:41:39.000000000 +0000
-+++ emf-2.4.1/org.eclipse.xsd.doc/build/antJavadoc.sh	2008-12-11 16:41:52.000000000 +0000
+--- org.eclipse.xsd.doc/build/antJavadoc.sh	2008-12-11 16:41:39.000000000 +0000
++++ org.eclipse.xsd.doc/build/antJavadoc.sh	2008-12-11 16:41:52.000000000 +0000
 @@ -12,9 +12,9 @@
  
  debug=0; if [ $debug -gt 0 ]; then echo "[antJd] debug: "$debug; fi

More information about the scm-commits mailing list