diff --git a/eclipse.spec b/eclipse.spec index bf758e1..a28dd73 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -19,7 +19,7 @@ Epoch: 1 Summary: An open, extensible IDE Name: eclipse Version: %{eclipse_majmin}.%{eclipse_micro} -Release: 33%{?dist} +Release: 34%{?dist} License: Eclipse Public License Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/ @@ -1036,7 +1036,16 @@ for id in `ls configuration/org.eclipse.osgi/bundles`; do done popd -# Install the SWT symlinks in libdir +# Install symlinks to the SWT JNI shared libraries in /usr/lib/eclipse with sane +# versions +pushd $RPM_BUILD_ROOT%{_libdir}/%{name} +for lib in $(find configuration -name libswt\*.so); do + ln -s %{_libdir}/%{name}/$lib `basename $lib | sed "s/-gtk-.*.so/-gtk-%{eclipse_majmin}.so/"` + ln -s %{_libdir}/%{name}/$lib `basename $lib | sed "s/-gtk-.*.so/-gtk-%{eclipse_majmin}.%{eclipse_micro}.so/"` +done +popd + +# Install the SWT jar symlinks in libdir SWTJARVERSION=$(grep v$SWT_VERSION plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}/build.xml | sed "s:.*<.*\"\(.*\)\"/>:\1:") pushd $RPM_BUILD_ROOT%{_libdir}/%{name} ln -s %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_$SWTJARVERSION.jar swt-gtk-%{eclipse_majmin}.%{eclipse_micro}.jar @@ -1431,6 +1440,7 @@ fi %dir %{_datadir}/%{name} %dir %{_datadir}/%{name}/plugins %dir %{_libdir}/%{name} +%dir %{_libdir}/%{name}/libswt-*.so %dir %{_libdir}/%{name}/plugins %dir %{_libdir}/%{name}/configuration %dir %{_libdir}/%{name}/configuration/org.eclipse.osgi @@ -1732,6 +1742,10 @@ fi %{_libdir}/%{name}/plugins/org.eclipse.sdk_* %changelog +* Tue Jan 30 2007 Ben Konrath 3.2.1-34 +- Create symlinks to the SWT JNI libs in %%{_libdir}/eclipse with sane + versions. + * Mon Jan 29 2007 Ben Konrath 3.2.1-33 - Check for features directory in sdk postun script. - Resolves: #224588.