rpms/eclipse-emf/devel eclipse-emf.spec,1.4,1.5

[Andrew Overholt (overholt)]

Author: overholt

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

Modified Files:
	eclipse-emf.spec 
Log Message:
* Mon Nov 06 2006 Andrew Overholt <overholt at redhat.com> 2.2.1-3
- Use copy-platform in %%{_libdir}.
- Add Requires(post,postun) for sub-packages using rebuild-gcj-db.



Index: eclipse-emf.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-emf/devel/eclipse-emf.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- eclipse-emf.spec	1 Nov 2006 02:02:15 -0000	1.4
+++ eclipse-emf.spec	6 Nov 2006 19:44:56 -0000	1.5
@@ -8,7 +8,7 @@
 Summary:        Eclipse Modeling Framework (EMF)
 Name:           eclipse-emf
 Version:        %{major}.%{minor}.%{micro}
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        Eclipse Public License
 Group:          System Environment/Libraries
 URL:            http://www.eclipse.org/emf/
@@ -63,6 +63,10 @@
 Summary:        Eclipse EMF SDO
 Group:          System Environment/Libraries
 Requires:       %{name} = %{version}-%{release}
+%if %{gcj_support}
+Requires(post):   java-gcj-compat >= 1.0.64
+Requires(postun): java-gcj-compat >= 1.0.64
+%endif
 
 %package        sdo-sdk
 Summary:        Eclipse EMF SDO Source (SDK)
@@ -73,6 +77,10 @@
 Summary:        Eclipse EMF XSD
 Group:          System Environment/Libraries
 Requires:       %{name} = %{version}-%{release}
+%if %{gcj_support}
+Requires(post):   java-gcj-compat >= 1.0.64
+Requires(postun): java-gcj-compat >= 1.0.64
+%endif
 
 %package        xsd-sdk
 Summary:        Eclipse EMF XSD Source (SDK)
@@ -84,6 +92,10 @@
 Group:          System Environment/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:       %{name}-xsd = %{version}-%{release}
+%if %{gcj_support}
+Requires(post):   java-gcj-compat >= 1.0.64
+Requires(postun): java-gcj-compat >= 1.0.64
+%endif
 
 %package        standalone
 Summary:        Eclipse EMF Standalone
@@ -144,7 +156,7 @@
 homedir=$(cd home > /dev/null && pwd)
 
 # See comments in the script to understand this.
-/bin/sh -x %{eclipse_base}/buildscripts/copy-platform `pwd`/SDK %{eclipse_base}
+/bin/sh -x %{_libdir}/eclipse/buildscripts/copy-platform `pwd`/SDK %{eclipse_base}
 SDK=$(cd SDK > /dev/null && pwd)
 
 # Build the EMF builder helper jars
@@ -163,10 +175,7 @@
 echo "<project default=\"main\"><target name=\"main\"></target></project>" > build/assemble.org.eclipse.emf.build.ant.all.xml
 echo "<project default=\"main\"><target name=\"main\"></target></project>" > build/package.org.eclipse.emf.build.ant.all.xml
 
-java -cp %{eclipse_base}/startup.jar                   \
-     -Duser.home=$homedir                              \
-     -Dosgi.sharedConfiguration.area=$SDK/fragments/eclipse/configuration \
-     org.eclipse.core.launcher.Main                    \
+eclipse \
      -application org.eclipse.ant.core.antRunner       \
      -Dtype=plugin                                    \
      -Did=org.eclipse.emf.build.ant                   \
@@ -176,8 +185,7 @@
      -f %{eclipse_base}/plugins/org.eclipse.pde.build/scripts/build.xml
 
 pushd build/plugins/org.eclipse.emf.build.ant
-java -cp /usr/share/eclipse/startup.jar                   \
-     org.eclipse.core.launcher.Main                    \
+eclipse \
      -application org.eclipse.ant.core.antRunner       \
      -f build.xml build.update.jar
 popd
@@ -197,11 +205,8 @@
 # Remove the bits of the SDK that we don't need
 rm SDK/features/org.eclipse.pde.source*
 rm SDK/features/org.eclipse.jdt.source*
-rm SDK/features/org.eclipse.sdk*
 rm SDK/plugins/org.eclipse.pde.source*
 rm SDK/plugins/org.eclipse.jdt.source*
-rm SDK/plugins/org.eclipse.jdt.doc*
-rm SDK/plugins/org.eclipse.sdk*
 # This tomcat chicanery will be fixed in a future Eclipse SDK RPM
 mkdir SDK2
 pushd SDK
@@ -233,6 +238,11 @@
 
 # some notes about what we're doing here:
 #
+# -Dosgi.sharedConfiguration.area=: we can't use the binary launcher since it
+#                                   doesn't see the EMF helper plugins so we
+#                                   have to set this manually.  If it ever
+#                                   changes in the Eclipse SDK, we'll need to
+#                                   change it here.
 # -Duser.home=$homedir: override java.home in the vm so that eclipse only adds files in the buildroot 
 # -Dcomponent=sdk: the component of EMF we want to build 
 # -DjavacFailOnError=true: fail if there is an error 
@@ -243,6 +253,7 @@
 # -DskipFetch=true: don't fetch the sources 
 # -DbaseExists=true: don't download the SDK, we want to use the one in $SDK
 java -cp $SDK/startup.jar \
+    -Dosgi.sharedConfiguration.area=%{_libdir}/eclipse/configuration                        \
     -Duser.home=$homedir                        \
      org.eclipse.core.launcher.Main             \
     -application org.eclipse.ant.core.antRunner \
@@ -317,6 +328,12 @@
 rm -rf ${RPM_BUILD_ROOT}
 
 %if %{gcj_support}
+%post
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+
 %post sdo
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
@@ -502,6 +519,10 @@
 %doc %{_datadir}/java/emf/readme_standalone.html
 
 %changelog
+* Mon Nov 06 2006 Andrew Overholt <overholt at redhat.com> 2.2.1-3
+- Use copy-platform in %%{_libdir}.
+- Add Requires(post,postun) for sub-packages using rebuild-gcj-db.
+
 * Tue Oct 31 2006 Andrew Overholt <overholt at redhat.com> 2.2.1-2
 - Change usage of copy-platform to work with upcoming changes to SDK.
 - Pass -Dosgi.sharedConfiguration.area to work with new split SDK installation.