diff --git a/eclipse.spec b/eclipse.spec index ff8307e..ea7fc87 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -52,7 +52,7 @@ Epoch: 1 Summary: %{pkg_summary} Name: eclipse Version: %{eclipse_majmin}.%{eclipse_micro}_fc -Release: 5 +Release: 6 License: CPL Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/ @@ -76,6 +76,7 @@ Source22: %{name}-tutorials.pdf Source23: %{name}-jdt.jarswithnativelibs Source24: %{name}-pde.jarswithnativelibs Source25: %{name}-platform.jarswithnativelibs +Source26: %{libname}-gtk2.jarswithnativelibs Patch0: %{name}-make-gtk.patch Patch1: %{name}-make-core.patch @@ -605,6 +606,7 @@ gcj4 -fPIC -fjni -findirect-dispatch -shared -Wl,-Bsymbolic \ install -m 644 %{SOURCE23} $RPM_BUILD_ROOT%{_libdir}/%{name} install -m 644 %{SOURCE24} $RPM_BUILD_ROOT%{_libdir}/%{name} install -m 644 %{SOURCE25} $RPM_BUILD_ROOT%{_libdir}/%{name} +install -m 644 %{SOURCE26} $RPM_BUILD_ROOT%{_libdir}/%{name} # Copy jdtcore.jar to %{_datadir}/java for eclipse-ecj mkdir -p $RPM_BUILD_ROOT%{_datadir}/java @@ -639,6 +641,12 @@ for j in `cat %{_libdir}/%{name}/%{name}-platform.jarswithnativelibs`; do $j %{_libdir}/%{name}/`basename $j`.so; done +%post -n %{libname}-gtk2 +for j in `cat %{_libdir}/%{name}/%{libname}-gtk2.jarswithnativelibs`; do + gcj-dbtool4 -a %{_libdir}/%{name}/eclipse.db \ + $j %{_libdir}/%{name}/`basename $j`.so; +done + %clean rm -rf $RPM_BUILD_ROOT @@ -781,10 +789,14 @@ rm -rf $RPM_BUILD_ROOT # The rest of the native libraries %{_libdir}/%{name}/*.so %config(noreplace) %{_sysconfdir}/eclipse.conf +# FIXME: compile jars in a different way with the same name %attr(0644,root,root) %{_libdir}/%{name}/%{name}-platform.jarswithnativelibs - %changelog +* Tue Jan 25 2005 Andrew Overholt 1:3.0.1_fc-6 +- add missing jar-so combinations to lists +- add libswt3-gtk2 jar-so combinations + * Mon Jan 24 2005 Andrew Overholt 1:3.0.1_fc-5 - refine resources.jar.so workaround