rpms/eclipse-emf/devel eclipse-emf-buildAll.patch, 1.1, 1.2 eclipse-emf-customTargets.xml.patch, 1.1, 1.2 eclipse-emf-examples-dontChangeBundleClasspath.patch, 1.1, 1.2 eclipse-emf-javadoc.patch, 1.1, 1.2 eclipse-emf.spec, 1.6, 1.7 fetch-eclipse-emf.sh, 1.1, 1.2 sources, 1.2, 1.3 eclipse-emf-platformjavadocname.patch, 1.1, NONE

Andrew Overholt (overholt) fedora-extras-commits at redhat.com
Fri Feb 23 22:58:56 UTC 2007


Author: overholt

Update of /cvs/extras/rpms/eclipse-emf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14757

Modified Files:
	eclipse-emf-buildAll.patch eclipse-emf-customTargets.xml.patch 
	eclipse-emf-examples-dontChangeBundleClasspath.patch 
	eclipse-emf-javadoc.patch eclipse-emf.spec 
	fetch-eclipse-emf.sh sources 
Removed Files:
	eclipse-emf-platformjavadocname.patch 
Log Message:
* Fri Feb 23 2007 Andrew Overholt <overholt at redhat.com> 2.2.2-1
- 2.2.2
- Remove unnecessary patch for platform javadoc jar name.
- Symlink platform doc.isv from %%{_libdir}/eclipse/plugins.


eclipse-emf-buildAll.patch:

Index: eclipse-emf-buildAll.patch
===================================================================
RCS file: /cvs/extras/rpms/eclipse-emf/devel/eclipse-emf-buildAll.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eclipse-emf-buildAll.patch	30 Oct 2006 16:52:48 -0000	1.1
+++ eclipse-emf-buildAll.patch	23 Feb 2007 22:58:23 -0000	1.2
@@ -1,11 +1,6 @@
-Index: buildAll.xml
-===================================================================
-RCS file: /home/tools/org.eclipse.emf.releng.build/buildAll.xml,v
-retrieving revision 1.58
-diff -u -p -r1.58 buildAll.xml
---- buildAll.xml	19 Jun 2006 16:53:35 -0000	1.58
-+++ buildAll.xml	1 Aug 2006 23:07:02 -0000
-@@ -20,7 +20,7 @@
+--- buildAll.xml	2007-02-23 17:16:28.000000000 -0500
++++ buildAll.xml	2007-02-23 17:17:32.000000000 -0500
+@@ -19,7 +19,7 @@
  		<!-- Reduce the amount of info in the build log -->
  		<property name="javacVerbose" value="false"/>
  
@@ -14,18 +9,16 @@
  		<property file="${basedir}/repoInfo.properties"/>
  		<property name="testBase" location="${buildDirectory}/../testing"/>
  		<available file="${buildDirectory}/label.properties" property="label.properties.exists"/>
-@@ -43,7 +43,9 @@
+@@ -38,7 +38,7 @@
+ 			<equals arg1="${baseos}.${basews}" arg2="linux.motif" />
  		</condition>
  	  
- 	  <!-- build emf.build.jar -->
 -	  <property name="emfBuilderDir" location="${buildDirectory}/../org.eclipse.emf.releng.build" />
 +	  <property name="emfBuilderDir" location="${buildDirectory}/../.." />
-+	  <echo message="buildDirectory:  ${buildDirectory}"/>
-+	  <echo message="emfBuilderDir:  ${emfBuilderDir}"/>
- 	  <ant antfile="${emfBuilderDir}/org.eclipse.emf.build/build.xml" 
- 	       inheritall="false" dir="${emfBuilderDir}/org.eclipse.emf.build"/>
  	</target>
-@@ -136,6 +138,17 @@
+ 
+ 	<target name="create.label.properties" unless="label.properties.exists">
+@@ -119,6 +119,17 @@
  		<antcall target="cleanUp"/>
  	</target>
  

eclipse-emf-customTargets.xml.patch:

Index: eclipse-emf-customTargets.xml.patch
===================================================================
RCS file: /cvs/extras/rpms/eclipse-emf/devel/eclipse-emf-customTargets.xml.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eclipse-emf-customTargets.xml.patch	30 Oct 2006 16:52:48 -0000	1.1
+++ eclipse-emf-customTargets.xml.patch	23 Feb 2007 22:58:23 -0000	1.2
@@ -1,30 +1,24 @@
-Index: sdk/customTargets.xml
-===================================================================
-RCS file: /home/tools/org.eclipse.emf.releng.build/sdk/customTargets.xml,v
-retrieving revision 1.36
-diff -u -p -r1.36 customTargets.xml
---- sdk/customTargets.xml	17 Jul 2006 00:02:48 -0000	1.36
-+++ sdk/customTargets.xml	24 Oct 2006 17:27:48 -0000
-@@ -88,13 +88,15 @@
+diff -ur sdk/customTargets.xml sdk/customTargets.xml
+--- sdk/customTargets.xml	2007-02-23 17:01:56.000000000 -0500
++++ sdk/customTargets.xml	2007-02-23 17:02:52.000000000 -0500
+@@ -87,13 +87,14 @@
    <!-- Steps to do before generating build scripts -->
    <!-- ===================================================================== -->
    <target name="preGenerate">
 -    <property name="emfBuilderDir" location="${buildDirectory}/../org.eclipse.emf.releng.build" />
 +    <property name="emfBuilderDir" location="${buildDirectory}/../../org.eclipse.emf.releng.build" />
-+    <echo message="buildDirectory: ${buildDirectory}" />
      <echo message="emfBuilderDir: ${emfBuilderDir}" />
--    
 +    <echo message="bundlesDirectory: ${buildDirectory}/plugins" />
-+
+     
      <java classname="org.eclipse.emf.build.ChangeBundleClasspath"
-       classpath="${emfBuilderDir}/org.eclipse.emf.build/emf.build.jar">
+       classpath="${emfBuilderDir}/org.eclipse.emf.build/emf.build_jdk14.jar">
        <arg line="-bundlesDirectory ${buildDirectory}/plugins"/>
 -      <arg line="-bundleDirectoryExcludeRegex org\.eclipse\.(emf|xsd)\.cheatsheets"/>
 +      <arg line="-bundleDirectoryExcludeRegex org\.eclipse\.(emf|xsd)\.(cheatsheets|example)"/>
        <arg line="-verbose"/>
      </java>
  
-@@ -140,7 +142,7 @@
+@@ -139,7 +140,7 @@
    <!-- Steps to do after generating the build scripts -->
    <!-- ===================================================================== -->
    <target name="postGenerate">

eclipse-emf-examples-dontChangeBundleClasspath.patch:

Index: eclipse-emf-examples-dontChangeBundleClasspath.patch
===================================================================
RCS file: /cvs/extras/rpms/eclipse-emf/devel/eclipse-emf-examples-dontChangeBundleClasspath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eclipse-emf-examples-dontChangeBundleClasspath.patch	30 Oct 2006 16:52:48 -0000	1.1
+++ eclipse-emf-examples-dontChangeBundleClasspath.patch	23 Feb 2007 22:58:23 -0000	1.2
@@ -1,21 +1,15 @@
-Index: examples/customTargets.xml
-===================================================================
-RCS file: /home/tools/org.eclipse.emf.releng.build/examples/customTargets.xml,v
-retrieving revision 1.16
-diff -u -p -r1.16 customTargets.xml
---- examples/customTargets.xml	24 Aug 2006 14:47:17 -0000	1.16
-+++ examples/customTargets.xml	20 Oct 2006 16:05:43 -0000
-@@ -86,13 +86,6 @@
+--- examples/customTargets.xml	2007-02-23 17:18:15.000000000 -0500
++++ examples/customTargets.xml	2007-02-23 17:18:32.000000000 -0500
+@@ -85,12 +85,6 @@
    <!-- Steps to do before generating build scripts -->
    <!-- ===================================================================== -->
    <target name="preGenerate">
 -    <java classname="org.eclipse.emf.build.ChangeBundleClasspath" 
--    	classpath="${emfBuilderDir}/org.eclipse.emf.build/emf.build.jar">
+-    	classpath="${emfBuilderDir}/org.eclipse.emf.build/emf.build_jdk14.jar">
 -      <arg line="-bundlesDirectory ${buildDirectory}/plugins" />
 -      <arg line="-bundleDirectoryMatchRegex org\.eclipse\.emf\.(java|examples|library|exporter\.html).*\.*" />
 -      <arg line="-verbose" />
 -    </java>
--  	
+   	
    	<property name="eclipse.plugins" value="${buildDirectory}/plugins"/>
    	<emf.build.SetRequiredBundleVersionRanges verbose="true">
-   	  	<manifestSet dir="${eclipse.plugins}">

eclipse-emf-javadoc.patch:

Index: eclipse-emf-javadoc.patch
===================================================================
RCS file: /cvs/extras/rpms/eclipse-emf/devel/eclipse-emf-javadoc.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eclipse-emf-javadoc.patch	30 Oct 2006 16:52:48 -0000	1.1
+++ eclipse-emf-javadoc.patch	23 Feb 2007 22:58:23 -0000	1.2
@@ -1,16 +1,18 @@
-diff -uNr org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.emf.doc/build/antJavadoc.sh org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.emf.doc/build/antJavadoc.sh
---- org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.emf.doc/build/antJavadoc.sh	2006-07-13 13:57:55.000000000 -0400
-+++ org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.emf.doc/build/antJavadoc.sh	2006-07-13 13:57:08.000000000 -0400
-@@ -87,5 +87,5 @@
+diff -ur org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.emf.doc/build/antJavadoc.sh org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.emf.doc/build/antJavadoc.sh
+--- org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.emf.doc/build/antJavadoc.sh	2007-02-23 16:50:08.000000000 -0500
++++ org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.emf.doc/build/antJavadoc.sh	2007-02-23 16:52:24.000000000 -0500
+@@ -104,7 +104,7 @@
  ant	-f javadoc.xml \
  	-DdestDir="$destDir" \
  	-Dclasspath="$classpath" \
 -	-DeclipseDir="$eclipseDir" \
 +	-DeclipseDir="../../../../../../SDK" \
  	-Doverview="$eclipseDir/plugins/org.eclipse.emf.doc/build/overview.html"
-diff -uNr org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.emf.doc/build/javadoc.xml.template org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.emf.doc/build/javadoc.xml.template
---- org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.emf.doc/build/javadoc.xml.template	2006-07-13 13:57:08.000000000 -0400
-+++ org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.emf.doc/build/javadoc.xml.template	2006-07-13 15:09:47.000000000 -0400
+ # Generate topics_Reference.xml (replacement for doclet). 
+ trXML=$currentPath"/../topics_Reference.xml";
+diff -ur org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.emf.doc/build/javadoc.xml.template org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.emf.doc/build/javadoc.xml.template
+--- org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.emf.doc/build/javadoc.xml.template	2007-02-23 16:50:08.000000000 -0500
++++ org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.emf.doc/build/javadoc.xml.template	2007-02-23 16:56:21.000000000 -0500
 @@ -8,11 +8,11 @@
  	<property environment="env"/>
  	<property name="javaHome" value="${env.JAVA_HOME}"/>
@@ -21,50 +23,50 @@
  
  	<target name="extractPlatformJavadoc" unless="platformJavadocExists">
 -		<unzip src="${eclipseDir}/plugins/org.eclipse.platform.doc.isv.jar" dest="${javadoc.link.location}/platform/"/>
-+		<unzip src="${eclipseDir}/plugins/org.eclipse.platform.doc.isv_3.2.0.v20060612-0900.jar" dest="${javadoc.link.location}/platform/"/>
++		<unzip src="${eclipseDir}/plugins/org.eclipse.platform.doc.isv_3.2.2.R32x_v20070115.jar" dest="${javadoc.link.location}/platform/"/>
  	</target>
  	
  	<target name="javadoc" depends="extractPlatformJavadoc">
-diff -uNr org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.emf.ecore.sdo.doc/build/antJavadoc.sh org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.emf.ecore.sdo.doc/build/antJavadoc.sh
---- org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.emf.ecore.sdo.doc/build/antJavadoc.sh	2006-07-13 15:07:44.000000000 -0400
-+++ org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.emf.ecore.sdo.doc/build/antJavadoc.sh	2006-07-13 15:07:13.000000000 -0400
-@@ -63,5 +63,5 @@
+diff -ur org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.emf.ecore.sdo.doc/build/antJavadoc.sh org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.emf.ecore.sdo.doc/build/antJavadoc.sh
+--- org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.emf.ecore.sdo.doc/build/antJavadoc.sh	2007-02-23 16:50:08.000000000 -0500
++++ org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.emf.ecore.sdo.doc/build/antJavadoc.sh	2007-02-23 16:56:39.000000000 -0500
+@@ -73,5 +73,5 @@
  ant	-f javadoc.xml \
  	-DdestDir="$destDir" \
  	-Dclasspath="$classpath" \
 -	-DeclipseDir="$eclipseDir" \
 +	-DeclipseDir="../../../../../../SDK" \
  	-Doverview="$eclipseDir/plugins/org.eclipse.emf.ecore.sdo.doc/build/overview.html"
-diff -uNr org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.emf.ecore.sdo.doc/build/javadoc.xml.template org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.emf.ecore.sdo.doc/build/javadoc.xml.template
---- org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.emf.ecore.sdo.doc/build/javadoc.xml.template	2006-07-13 13:57:08.000000000 -0400
-+++ org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.emf.ecore.sdo.doc/build/javadoc.xml.template	2006-07-13 15:08:28.000000000 -0400
+diff -ur org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.emf.ecore.sdo.doc/build/javadoc.xml.template org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.emf.ecore.sdo.doc/build/javadoc.xml.template
+--- org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.emf.ecore.sdo.doc/build/javadoc.xml.template	2007-02-23 16:50:08.000000000 -0500
++++ org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.emf.ecore.sdo.doc/build/javadoc.xml.template	2007-02-23 16:57:22.000000000 -0500
 @@ -8,11 +8,11 @@
  	<property environment="env"/>
  	<property name="javaHome" value="${env.JAVA_HOME}"/>
  	
 -	<property name="javadoc.link.location" value="${eclipseDir}/javadoc"/>
-+	<property name="javadoc.link.location" value="../../../javadoc"/>
++	<property name="javadoc.link.location" value="../../../javadoc""/>
  	<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 src="${eclipseDir}/plugins/org.eclipse.platform.doc.isv_3.2.0.v20060612-0900.jar" dest="${javadoc.link.location}/platform/"/>
++		<unzip src="${eclipseDir}/plugins/org.eclipse.platform.doc.isv_3.2.2.R32x_v20070115.jar" dest="${javadoc.link.location}/platform/"/>
  	</target>
  	
  	<target name="javadoc" depends="extractPlatformJavadoc">
-diff -uNr org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.xsd.doc/build/antJavadoc.sh org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.xsd.doc/build/antJavadoc.sh
---- org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.xsd.doc/build/antJavadoc.sh	2006-07-13 15:09:00.000000000 -0400
-+++ org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.xsd.doc/build/antJavadoc.sh	2006-07-13 13:57:08.000000000 -0400
-@@ -69,5 +69,5 @@
+diff -ur org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.xsd.doc/build/antJavadoc.sh org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.xsd.doc/build/antJavadoc.sh
+--- org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.xsd.doc/build/antJavadoc.sh	2007-02-23 16:50:08.000000000 -0500
++++ org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.xsd.doc/build/antJavadoc.sh	2007-02-23 16:57:40.000000000 -0500
+@@ -79,5 +79,5 @@
  ant	-f javadoc.xml \
  	-DdestDir="$destDir" \
  	-Dclasspath="$classpath" \
 -	-DeclipseDir="$eclipseDir" \
 +	-DeclipseDir="../../../../../../SDK" \
  	-Doverview="$eclipseDir/plugins/org.eclipse.xsd.doc/build/overview.html"
-diff -uNr org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.xsd.doc/build/javadoc.xml.template org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.xsd.doc/build/javadoc.xml.template
---- org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.xsd.doc/build/javadoc.xml.template	2006-07-13 13:57:08.000000000 -0400
-+++ org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.xsd.doc/build/javadoc.xml.template	2006-07-13 15:09:42.000000000 -0400
+diff -ur org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.xsd.doc/build/javadoc.xml.template org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.xsd.doc/build/javadoc.xml.template
+--- org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.xsd.doc/build/javadoc.xml.template	2007-02-23 16:50:08.000000000 -0500
++++ org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.xsd.doc/build/javadoc.xml.template	2007-02-23 16:58:21.000000000 -0500
 @@ -8,11 +8,11 @@
  	<property environment="env"/>
  	<property name="javaHome" value="${env.JAVA_HOME}"/>
@@ -75,7 +77,7 @@
  
  	<target name="extractPlatformJavadoc" unless="platformJavadocExists">
 -		<unzip src="${eclipseDir}/plugins/org.eclipse.platform.doc.isv.jar" dest="${javadoc.link.location}/platform/"/>
-+		<unzip src="${eclipseDir}/plugins/org.eclipse.platform.doc.isv_3.2.0.v20060612-0900.jar" dest="${javadoc.link.location}/platform/"/>
++		<unzip src="${eclipseDir}/plugins/org.eclipse.platform.doc.isv_3.2.2.R32x_v20070115.jar" dest="${javadoc.link.location}/platform/"/>
  	</target>
  	
  	<target name="javadoc" depends="extractPlatformJavadoc">


Index: eclipse-emf.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-emf/devel/eclipse-emf.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- eclipse-emf.spec	6 Dec 2006 21:29:36 -0000	1.6
+++ eclipse-emf.spec	23 Feb 2007 22:58:23 -0000	1.7
@@ -1,40 +1,38 @@
 %define gcj_support     1
 %define major                   2
 %define minor                   2
-%define micro                   1
-%define build_id                build_200609210005
+%define micro                   2
+%define build_id                build_200702131851
 %define eclipse_base            %{_datadir}/eclipse
 
 Summary:        Eclipse Modeling Framework (EMF)
 Name:           eclipse-emf
 Version:        %{major}.%{minor}.%{micro}
-Release:        9%{?dist}
+Release:        1%{?dist}
 License:        Eclipse Public License
 Group:          System Environment/Libraries
 URL:            http://www.eclipse.org/emf/
-Requires:       eclipse-platform >= 1:3.2.1
-Requires:       eclipse-platform < 1:3.2.2
+Requires:       eclipse-platform >= 1:3.2.2
 
-# EMF's download page links to their map file for 2.2.1:
-#   http://download.eclipse.org/tools/emf/downloads/drops/2.2.1/R200609210005/directory.txt
-# and this tells us the CVS tag for 2.2.1. 
+# EMF's download page links to their map file for 2.2.2:
+#   http://download.eclipse.org/modeling/emf/emf/downloads/drops/2.2.2/R200702131851/directory.txt
+# and this tells us the CVS tag for 2.2.2. 
 #
-# Use the enclosed script to generate the source drop for EMF 2.2.1:
+# Use the enclosed script to generate the source drop for EMF 2.2.2:
 # 
 # sh fetch-eclipse-emf.sh emf :pserver:anonymous at dev.eclipse.org:/home/tools \
-#   build_200609210005 org.eclipse.emf.releng.build
+#   build_200702131851 org.eclipse.emf.releng.build
 
 Source0:        %{name}-fetched-src-%{build_id}.tar.bz2
 Source1:        fetch-%{name}.sh
 
 Patch0:         %{name}-customTargets.xml.patch
 Patch1:         %{name}-nobootclasspath.patch
-# Note, this patch includes the Eclipse SDK version number
+# Note, this patch includes the platform javadoc jar name
 Patch2:         %{name}-javadoc.patch
 Patch3:         %{name}-addforceContextQualiferproperty.patch
 Patch4:         %{name}-buildAll.patch
 Patch5:         %{name}-examples-dontChangeBundleClasspath.patch
-Patch6:         %{name}-platformjavadocname.patch
 
 BuildRequires:  eclipse-sdk
 %if %{gcj_support}
@@ -139,7 +137,6 @@
 %patch3 -p0
 %patch4 -p0
 %patch5 -p0
-%patch6 -p0
 
 # Don't ever use bootclasspath
 # FIXME:  why can't we use bootclasspath?  It gives the infamous
@@ -159,6 +156,15 @@
 /bin/sh -x %{eclipse_base}/buildscripts/copy-platform SDK %{eclipse_base}
 SDK=$(cd SDK > /dev/null && pwd)
 
+# We need the platform ISV docs which have been temporarily moved to
+# %%{_libdir}/eclipse/plugins so we symlink them into our SDK copy
+# We should probably put an unversioned symlink there so that we won't
+# have to change this with each release.
+pushd SDK/plugins
+ln -s \
+  %{_libdir}/eclipse/plugins/org.eclipse.platform.doc.isv_3.2.2.R32x_v20070115.jar
+popd
+
 # Build the EMF builder helper jars
 
 # for ChangeBundleClasspath
@@ -519,6 +525,11 @@
 %doc %{_datadir}/java/emf/readme_standalone.html
 
 %changelog
+* Fri Feb 23 2007 Andrew Overholt <overholt at redhat.com> 2.2.2-1
+- 2.2.2
+- Remove unnecessary patch for platform javadoc jar name.
+- Symlink platform doc.isv from %%{_libdir}/eclipse/plugins.
+
 * Wed Dec 06 2006 Andrew Overholt <overholt at redhat.com> 2.2.1-9
 - Bump release and build for rawhide.
 


Index: fetch-eclipse-emf.sh
===================================================================
RCS file: /cvs/extras/rpms/eclipse-emf/devel/fetch-eclipse-emf.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fetch-eclipse-emf.sh	30 Oct 2006 16:52:48 -0000	1.1
+++ fetch-eclipse-emf.sh	23 Feb 2007 22:58:23 -0000	1.2
@@ -135,6 +135,7 @@
 # Fetch the actual source
 
 java -cp /usr/share/eclipse/startup.jar \
+  -Dosgi.sharedConfiguration.area=/usr/lib/eclipse/configuration \
   -Duser.home=../home org.eclipse.core.launcher.Main \
   -application org.eclipse.ant.core.antRunner \
   -buildfile build.xml \
@@ -151,6 +152,7 @@
 # Fetch examples
 
 java -cp /usr/share/eclipse/startup.jar \
+    -Dosgi.sharedConfiguration.area=/usr/lib/eclipse/configuration \
     -Duser.home=../../home \
     org.eclipse.core.launcher.Main \
     -application org.eclipse.ant.core.antRunner \


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eclipse-emf/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Oct 2006 16:52:48 -0000	1.2
+++ sources	23 Feb 2007 22:58:23 -0000	1.3
@@ -1 +1 @@
-1269e4e5c40ab6f733a44c816f8e2eac  eclipse-emf-fetched-src-build_200609210005.tar.bz2
+f3704455b58a1af3aef9a8a2eb8df880  eclipse-emf-fetched-src-build_200702131851.tar.bz2


--- eclipse-emf-platformjavadocname.patch DELETED ---




More information about the fedora-extras-commits mailing list