diff --git a/eclipse.spec b/eclipse.spec index c185e5d..e1885a8 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -34,7 +34,7 @@ ExclusiveArch: i386 x86_64 ppc Summary: %{pkg_summary} Name: eclipse Version: %{eclipse_majmin}.%{eclipse_micro}_fc -Release: 0.M5.9 +Release: 0.M5.10 License: CPL Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/ @@ -87,8 +87,8 @@ BuildRequires: jpackage-utils >= 0:1.5, make, gcc BuildRequires: gnome-vfs2-devel BuildRequires: gtk2-devel BuildRequires: glib2-devel -BuildRequires: mozilla -BuildRequires: mozilla-devel +BuildRequires: mozilla >= 1.7.5 +BuildRequires: mozilla-devel >= 1.7.5 BuildRequires: gcc-java >= 4.0.0-0.30 BuildRequires: java-1.4.2-gcj-compat-devel >= 1.4.2.0-40jpp_4rh @@ -391,6 +391,10 @@ done rm \ .%{_libdir}/%{name}/plugins/org.eclipse.core.resources_%{eclipse_majmin}.%{eclipse_micro}/resources.jar.so +# FIXME: temporarily remove eclipseAdaptor.jar +rm \ + .%{_libdir}/%{name}/plugins/org.eclipse.osgi_%{eclipse_majmin}.%{eclipse_micro}/eclipseAdaptor.jar.so + # Tar up the native libs tar czvf ../%{name}-nativelycompiledjars.tar.gz .%{_libdir}/%{name} @@ -921,7 +925,8 @@ fi %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30/naming-resources.jar.so %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30/tomcat-http11.jar.so %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.osgi_3.1.0/core.jar.so -%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.osgi_3.1.0/eclipseAdaptor.jar.so +# FIXME: Don't forget to re-add this jar to eclipse-platform.jarswithnativelibs +#%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.osgi_3.1.0/eclipseAdaptor.jar.so %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.team.cvs.ssh2_3.1.0/cvsssh2.jar.so %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.apache.ant_1.6.2/lib/ant-stylebook.jar.so %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.apache.ant_1.6.2/lib/ant-javamail.jar.so @@ -964,6 +969,11 @@ fi %{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_3.1.0 %changelog +* Fri Mar 04 2005 Andrew Overholt 3.1.0_fc-0.M5.10 +- Add proper mozilla version. +- Don't build eclipseAdaptor.jar.so in order to work around plugin building + problems. + * Thu Mar 03 2005 Andrew Overholt 3.1.0_fc-0.M5.9 - Add patch to build libswt-mozilla. - Build libswt-awt.