rpms/eclipse-emf/devel eclipse-emf.spec, 1.17, 1.18 sources, 1.8, 1.9 get-emf.sh, 1.4, 1.5

[mbooth]

Author: mbooth

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

Modified Files:
	eclipse-emf.spec sources get-emf.sh 
Log Message:
* Sun Jun 28 2009 Mat Booth <fedora at matbooth.co.uk> 2.5.0-1
- Update to 2.5.0 final release (Galileo).
- Build the features seperately to allow for a saner %%files section.


Index: eclipse-emf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-emf/devel/eclipse-emf.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- eclipse-emf.spec	22 May 2009 17:18:26 -0000	1.17
+++ eclipse-emf.spec	28 Jun 2009 22:10:54 -0000	1.18
@@ -4,7 +4,7 @@
 
 Name:      eclipse-emf
 Version:   2.5.0
-Release:   0.2.RC1%{?dist}
+Release:   1%{?dist}
 Summary:   Eclipse Modeling Framework (EMF) Eclipse plugin
 Group:     System Environment/Libraries
 License:   EPL
@@ -21,6 +21,7 @@ Patch0:    %{name}-make-homeless.patch
 # look inside correct directory for platform docs
 Patch1:    %{name}-platform-docs-location.patch
 # look inside all symlink'd plugin directories when building javadocs
+# this patch has been sent upstream, see eclipse.org bug #281779
 Patch2:    %{name}-symlinked-classpath.patch
 # don't include hidden files in source plugins
 # (mostly to shut rpmlint up, but these files aren't needed for source plugin builds; they
@@ -97,8 +98,9 @@ Requires:  %{name}-xsd     = %{version}-
 Requires:  %{name}-xsd-sdk = %{version}-%{release}
 
 %description examples
-Example projects that demonstrate how to use the Eclipse Modeling Framework
-(EMF) and XML Schema Definition (XSD) plugins.
+Installable versions of the example projects from the SDKs that demonstrate how
+to use the Eclipse Modeling Framework (EMF) and XML Schema Definition (XSD)
+plugins.
 
 %prep
 %setup -q -n emf-%{version}
@@ -130,142 +132,83 @@ if [ ! -z "$JARS" ]; then
 fi
 
 %build
-# 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=v200903161215"
+# Note: We use forceContextQualifier because the docs plugins use custom build
+#       scripts and don't work otherwise.
+OPTIONS="-DjavacTarget=1.5 -DjavacSource=1.5 -DforceContextQualifier=v200906151043"
+
+# We build the emf, xsd and examples features seperately, rather than just
+# building the "all" feature, because it makes the files section easier to
+# maintain (i.e. we don't have to know when upstream adds a new plugin)
+
+# build emf features
+%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.emf -a "$OPTIONS"
+%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.emf.sdk -a "$OPTIONS"
+
+# build xsd features
+%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.xsd -a "$OPTIONS"
+%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.xsd.edit -a "$OPTIONS"
+%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.xsd.editor -a "$OPTIONS"
+%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.xsd.mapping -a "$OPTIONS"
+%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.xsd.mapping.editor -a "$OPTIONS"
+%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.xsd.ecore.converter -a "$OPTIONS"
+%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.xsd.sdk -a "$OPTIONS"
+
+# build examples features
+%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.emf.examples -a "$OPTIONS"
 
 %install
 rm -rf %{buildroot}
 install -d -m 755 %{buildroot}%{eclipse_dropin}
-unzip -q -d %{buildroot}%{eclipse_dropin}/emf build/rpmBuild/org.eclipse.emf.all.zip
+unzip -q -n -d %{buildroot}%{eclipse_dropin}/emf          build/rpmBuild/org.eclipse.emf.zip
+unzip -q -n -d %{buildroot}%{eclipse_dropin}/emf-sdk      build/rpmBuild/org.eclipse.emf.sdk.zip
+unzip -q -n -d %{buildroot}%{eclipse_dropin}/xsd          build/rpmBuild/org.eclipse.xsd.zip
+unzip -q -n -d %{buildroot}%{eclipse_dropin}/xsd          build/rpmBuild/org.eclipse.xsd.edit.zip
+unzip -q -n -d %{buildroot}%{eclipse_dropin}/xsd          build/rpmBuild/org.eclipse.xsd.editor.zip
+unzip -q -n -d %{buildroot}%{eclipse_dropin}/xsd          build/rpmBuild/org.eclipse.xsd.mapping.zip
+unzip -q -n -d %{buildroot}%{eclipse_dropin}/xsd          build/rpmBuild/org.eclipse.xsd.mapping.editor.zip
+unzip -q -n -d %{buildroot}%{eclipse_dropin}/xsd          build/rpmBuild/org.eclipse.xsd.ecore.converter.zip
+unzip -q -n -d %{buildroot}%{eclipse_dropin}/xsd-sdk      build/rpmBuild/org.eclipse.xsd.sdk.zip
+unzip -q -n -d %{buildroot}%{eclipse_dropin}/emf-examples build/rpmBuild/org.eclipse.emf.examples.zip
+
+# the non-sdk builds are a subset of the sdk builds, so delete duplicate features & plugins from the sdks
+(cd %{buildroot}%{eclipse_dropin}/emf-sdk/eclipse/features && ls %{buildroot}%{eclipse_dropin}/emf/eclipse/features | xargs rm -rf)
+(cd %{buildroot}%{eclipse_dropin}/emf-sdk/eclipse/plugins  && ls %{buildroot}%{eclipse_dropin}/emf/eclipse/plugins  | xargs rm -rf)
+(cd %{buildroot}%{eclipse_dropin}/xsd-sdk/eclipse/features && ls %{buildroot}%{eclipse_dropin}/xsd/eclipse/features | xargs rm -rf)
+(cd %{buildroot}%{eclipse_dropin}/xsd-sdk/eclipse/plugins  && ls %{buildroot}%{eclipse_dropin}/xsd/eclipse/plugins  | xargs rm -rf)
 
 %clean
 rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%dir %{eclipse_dropin}/emf
-%dir %{eclipse_dropin}/emf/eclipse
-%dir %{eclipse_dropin}/emf/eclipse/features
-%dir %{eclipse_dropin}/emf/eclipse/plugins
+%{eclipse_dropin}/emf
 %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,-)
+%{eclipse_dropin}/emf-sdk
 %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,-)
+%{eclipse_dropin}/xsd
 %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,-)
+%{eclipse_dropin}/xsd-sdk
 %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,-)
+%{eclipse_dropin}/emf-examples
 %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
+* Sun Jun 28 2009 Mat Booth <fedora at matbooth.co.uk> 2.5.0-1
+- Update to 2.5.0 final release (Galileo).
+- Build the features seperately to allow for a saner %%files section.
+
 * Fri May 22 2009 Alexander Kurtakov <akurtako at redhat.com> 2.5.0-0.2.RC1
 - Update to 2.5.0 RC1.
 - Use %%global instead of %%define. 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-emf/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	22 May 2009 17:24:15 -0000	1.8
+++ sources	28 Jun 2009 22:10:54 -0000	1.9
@@ -1 +1 @@
-45157cd6abbf48173ca2980b5cab55ea  emf-2.5.0.tar.gz
+018bedc23d1e8f931c887d69d6bc4782  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.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- get-emf.sh	22 May 2009 17:18:26 -0000	1.4
+++ get-emf.sh	28 Jun 2009 22:10:54 -0000	1.5
@@ -1,7 +1,7 @@
 #!/bin/bash
 NAME="emf"
 VERSION=2.5.0
-TAG="S200905172106"
+TAG="R200906151043"
 
 echo "Exporting from CVS..."
 mkdir $NAME-$VERSION
@@ -22,14 +22,14 @@ if (NF <  4) {
 	split($1, version, "=");
 	split(version[1], directory, "@");
 	cvsdir=split($2, dirName, ":");
-	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";
+	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 %s %s\n", ":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\n", ":pserver:anonymous at dev.eclipse.org:", dirName[cvsdir], "-q export -r", version[2], "-d", directory[total], $4) | "/bin/bash";
 }
 
 }' $TEMPMAPFILE