rpms/eclipse/devel eclipse.spec,1.182,1.183
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Sat Oct 8 19:10:02 UTC 2005
Author: overholt
Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23317
Modified Files:
eclipse.spec
Log Message:
* Sat Oct 08 2005 Andrew Overholt <overholt at redhat.com> 3.1.0_fc-15
- Bump mozilla requirement.
- Re-enable org.eclipse.ui.forms_3.1.0.jar.so, org.eclipse.osgi_3.1.0.jar.so,
and org.eclipse.ui.workbench_3.1.0.jar.so (rh#146463, rh#158137, rh#151919)
- Add patch for /etc/gre64.conf (for 64-bit systems, rh#168040, e.o#109253).
- Remove MOZILLA_FIVE_HOME magic from eclipse.script.
Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -r1.182 -r1.183
--- eclipse.spec 19 Sep 2005 19:57:47 -0000 1.182
+++ eclipse.spec 8 Oct 2005 19:09:58 -0000 1.183
@@ -116,9 +116,9 @@
BuildRequires: glib2-devel
BuildRequires: gcc-c++
%ifnarch ppc64
-BuildRequires: mozilla = 37:1.7.11
-BuildRequires: mozilla-devel = 37:1.7.11
-BuildRequires: nspr-devel
+BuildRequires: mozilla = 37:1.7.12
+BuildRequires: mozilla-devel = 37:1.7.12
+BuildRequires: mozilla-nspr-devel
BuildRequires: xorg-x11-devel
%endif
%if %{gcj_support}
@@ -518,22 +518,24 @@
## 2a. Build ecj
export CLASSPATH=ecj-bootstrap.jar:$ORIGCLASSPATH
#export GCJ_PROPERTIES="gnu.gcj.precompiled.db.path=`pwd`/ecj-bootstrap.db"
+ #export ANT_OPTS="-Dgnu.gcj.precompiled.db.path=`pwd`/ecj-bootstrap.db"
%endif
ant -buildfile jdtcoresrc/compilejdtcorewithjavac.xml
%if %{gcj_support}
## 2b. Natively-compile ecj
#gcj -fPIC -fjni -findirect-dispatch -shared -Wl,-Bsymbolic \
- # -o jdtcoresrc/jdtcore.jar.so jdtcoresrc/jdtcore.jar
- #
- #gcj-dbtool -n jdtcoresrc/jdtcore.db 30000
- #gcj-dbtool -a jdtcoresrc/jdtcore.db jdtcoresrc/jdtcore.jar{,.so}
- #export GCJ_PROPERTIES="gnu.gcj.precompiled.db.path=`pwd`/jdtcoresrc/jdtcore.db"
- #
- ## Remove our gcj-built ecj
- #rm ecj-bootstrap.db ecj-bootstrap.jar
+ # -o jdtcoresrc/ecj.jar.so jdtcoresrc/ecj.jar
+ #
+ # gcj-dbtool -n jdtcoresrc/ecj.db 30000
+ # gcj-dbtool -a jdtcoresrc/ecj.db jdtcoresrc/ecj.jar{,.so}
+ # export GCJ_PROPERTIES="gnu.gcj.precompiled.db.path=`pwd`/jdtcoresrc/ecj.db"
+ #
+ # # Remove our gcj-built ecj
+ # rm ecj-bootstrap.db ecj-bootstrap.jar{,.so}
rm ecj-bootstrap.jar
# To enSURE we're not using any pre-compiled ecj on the build system, set this
+ #export ANT_OPTS="-Dgnu.gcj.precompiled.db.path=`pwd`/jdtcoresrc/ecj.db"
export ANT_OPTS="-Dgnu.gcj.precompiled.db.path=blah"
%endif
@@ -544,13 +546,14 @@
%if %{gcj_support}
## Natively-compile it
#gcj -fPIC -fjni -findirect-dispatch -shared -Wl,-Bsymbolic \
- # -o jdtcore.jar.so jdtcore.jar
- #gcj-dbtool -n jdtcore.db 30000
- #gcj-dbtool -a jdtcore.db jdtcore.jar{,.so}
- #export GCJ_PROPERTIES="gnu.gcj.precompiled.db.path=`pwd`/jdtcore.db"
- #
- ## Remove old native bits
- #rm jdtcoresrc/jdtcore.db jdtcoresrc/jdtcore.jar.so
+ # -o ecj.jar.so ecj.jar
+ #gcj-dbtool -n ecj.db 30000
+ #gcj-dbtool -a ecj.db ecj.jar{,.so}
+ #export GCJ_PROPERTIES="gnu.gcj.precompiled.db.path=`pwd`/ecj.db"
+ #export ANT_OPTS="-Dgnu.gcj.precompiled.db.path=`pwd`/ecj.db"
+
+ # Remove old native bits
+ #rm jdtcoresrc/ecj.db jdtcoresrc/ecj.jar.so
%endif
# Build the rest of Eclipse
@@ -839,16 +842,7 @@
$RPM_BUILD_ROOT%{_datadir}/java/eclipse-ecj.jar
%if %{gcj_support}
-# FIXME: temporarily disable org.eclipse.ui.forms_3.1.0.jar.so
-# see: https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=146463
-# FIXME: temporarily disable org.eclipse.ui.workbench_3.1.0.jar.so
-# see: https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=151919
-# FIXME: temporarily disable org.eclipse.osgi_3.1.0.jar.so
-# see: https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=158137
-aot-compile-rpm \
---exclude %{_datadir}/%{name}/plugins/org.eclipse.ui.workbench_%{eclipse_majmin}.%{eclipse_micro}.jar \
---exclude %{_datadir}/%{name}/plugins/org.eclipse.ui.forms_%{eclipse_majmin}.%{eclipse_micro}.jar \
---exclude %{_datadir}/%{name}/plugins/org.eclipse.osgi_%{eclipse_majmin}.%{eclipse_micro}.jar
+aot-compile-rpm
# Build and install ecj binary
pushd $RPM_BUILD_ROOT%{_libdir}/gcj/%{name}
@@ -1089,10 +1083,8 @@
%{_libdir}/gcj/%{name}/org.eclipse.ui.editors_3.1.0.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.ui.externaltools_3.1.0.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.ui.externaltools_3.1.0.jar.so
-# FIXME: temporarily disable org.eclipse.ui.forms_3.1.0.jar.so
-# see: https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=146463
-#%{_libdir}/gcj/%{name}/org.eclipse.ui.forms_3.1.0.jar.db
-#%{_libdir}/gcj/%{name}/org.eclipse.ui.forms_3.1.0.jar.so
+%{_libdir}/gcj/%{name}/org.eclipse.ui.forms_3.1.0.jar.db
+%{_libdir}/gcj/%{name}/org.eclipse.ui.forms_3.1.0.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.ui.ide_3.1.0.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.ui.ide_3.1.0.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.ui.intro_3.1.0.jar.db
@@ -1101,10 +1093,8 @@
%{_libdir}/gcj/%{name}/org.eclipse.ui.presentations.r21_3.1.0.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.ui.views_3.1.0.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.ui.views_3.1.0.jar.so
-# FIXME: temporarily disable org.eclipse.ui.workbench_3.1.0.jar.so
-# see: https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=151919
-#%{_libdir}/gcj/%{name}/org.eclipse.ui.workbench_3.1.0.jar.so
-#%{_libdir}/gcj/%{name}/org.eclipse.ui.workbench_3.1.0.jar.db
+%{_libdir}/gcj/%{name}/org.eclipse.ui.workbench_3.1.0.jar.so
+%{_libdir}/gcj/%{name}/org.eclipse.ui.workbench_3.1.0.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.ui.workbench.texteditor_3.1.0.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.ui.workbench.texteditor_3.1.0.jar.so
%{_libdir}/gcj/%{name}/compatibility.jar.db
@@ -1117,10 +1107,8 @@
%{_libdir}/gcj/%{name}/org.eclipse.update.scheduler_3.1.0.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.update.ui_3.1.0.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.update.ui_3.1.0.jar.so
-# FIXME: temporarily disable org.eclipse.osgi_3.1.0.jar.so
-# see: https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=158137
-#%{_libdir}/gcj/%{name}/org.eclipse.osgi_3.1.0.jar.so
-#%{_libdir}/gcj/%{name}/org.eclipse.osgi_3.1.0.jar.db
+%{_libdir}/gcj/%{name}/org.eclipse.osgi_3.1.0.jar.so
+%{_libdir}/gcj/%{name}/org.eclipse.osgi_3.1.0.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.osgi.services_3.1.0.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.osgi.services_3.1.0.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.osgi.util_3.1.0.jar.db
@@ -1170,8 +1158,11 @@
%{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_3.1.0
%changelog
-* Mon Sep 19 2005 Andrew Overholt <overholt at redhat.com> 3.1.0_fc-15
-- Include patch for /etc/gre64.conf (e.o#109253, rh#168040).
+* Sat Oct 08 2005 Andrew Overholt <overholt at redhat.com> 3.1.0_fc-15
+- Bump mozilla requirement.
+- Re-enable org.eclipse.ui.forms_3.1.0.jar.so, org.eclipse.osgi_3.1.0.jar.so,
+ and org.eclipse.ui.workbench_3.1.0.jar.so (rh#146463, rh#158137, rh#151919)
+- Add patch for /etc/gre64.conf (for 64-bit systems, rh#168040, e.o#109253).
- Remove MOZILLA_FIVE_HOME magic from eclipse.script.
* Wed Aug 24 2005 Andrew Overholt <overholt at redhat.com> 3.1.0_fc-14
More information about the fedora-cvs-commits
mailing list