rpms/eclipse-emf/FC-6 eclipse-emf.spec,1.2,1.3
Andrew Overholt (overholt)
fedora-extras-commits at redhat.com
Mon Nov 6 20:36:37 UTC 2006
Author: overholt
Update of /cvs/extras/rpms/eclipse-emf/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14253
Modified Files:
eclipse-emf.spec
Log Message:
* Mon Nov 06 2006 Andrew Overholt <overholt at redhat.com> 2.2.1-2
- Add Requires(post,postun) for sub-packages using rebuild-gcj-db.
- Change usage of copy-platform to work with upcoming changes to SDK.
Index: eclipse-emf.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-emf/FC-6/eclipse-emf.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- eclipse-emf.spec 30 Oct 2006 17:53:31 -0000 1.2
+++ eclipse-emf.spec 6 Nov 2006 20:36:06 -0000 1.3
@@ -8,7 +8,7 @@
Summary: Eclipse Modeling Framework (EMF)
Name: eclipse-emf
Version: %{major}.%{minor}.%{micro}
-Release: 1%{?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 SDK %{eclipse_base}
+/bin/sh -x %{eclipse_base}/buildscripts/copy-platform `pwd`/SDK %{eclipse_base}
SDK=$(cd SDK > /dev/null && pwd)
# Build the EMF builder helper jars
@@ -163,9 +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 \
- org.eclipse.core.launcher.Main \
+eclipse \
-application org.eclipse.ant.core.antRunner \
-Dtype=plugin \
-Did=org.eclipse.emf.build.ant \
@@ -175,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
@@ -196,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
@@ -316,6 +322,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
@@ -501,6 +513,10 @@
%doc %{_datadir}/java/emf/readme_standalone.html
%changelog
+* Mon Nov 06 2006 Andrew Overholt <overholt at redhat.com> 2.2.1-2
+- Add Requires(post,postun) for sub-packages using rebuild-gcj-db.
+- Change usage of copy-platform to work with upcoming changes to SDK.
+
* Thu Oct 19 2006 Andrew Overholt <overholt at redhat.com> 2.2.1-1
- 2.2.1.
- Add sdk package, fix up inter-dependencies to match upstream.
More information about the fedora-extras-commits
mailing list