diff --git a/eclipse.spec b/eclipse.spec index 73d7378..84466d6 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -24,7 +24,7 @@ Epoch: 1 Summary: %{pkg_summary} Name: eclipse Version: %{eclipse_majmin}.%{eclipse_micro}_fc -Release: 0.RC3.1 +Release: 0.RC3.2 License: EPL Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/ @@ -689,7 +689,17 @@ for l in `find configuration -name \*.so`; do mv $l $RPM_BUILD_ROOT%{_libdir}/%{name}; pushd `dirname $l`; ln -sf %{_libdir}/%{name}/`basename $l`; - popd + popd; + # Make note of the SWT bundle number for later + if [ "`basename $l`" = "libswt-gtk-%{swt_version}.so" ] + then + pushd `dirname $l`; + cd ../..; + currentDir=`pwd`; + # Add this directory to the files list for libswt + echo $currentDir | gawk -F '/' '{ print "/"$5"/"$6"/"$7"/"$8"/"$9"/"$10"/"$11 }' > %{_builddir}/%{buildsubdir}/%{libname}-gtk2.install; + popd + fi done popd @@ -754,7 +764,7 @@ install -p -D -m0644 %{SOURCE2} \ cat %{SOURCE7} > %{name}-jdt.install cat %{SOURCE8} > %{name}-pde.install cat %{SOURCE9} > %{name}-platform.install -cat %{SOURCE10} > %{libname}-gtk2.install +cat %{SOURCE10} >> %{libname}-gtk2.install cat >> $RPM_BUILD_ROOT%{_datadir}/%{name}/.eclipseproduct << EOF name=Eclipse Platform @@ -1021,7 +1031,8 @@ fi %dir %{_datadir}/%{name}/plugins %dir %{_datadir}/%{name}/features %dir %{_datadir}/%{name}/configuration -%{_datadir}/%{name}/configuration/org.eclipse.osgi/bundles/37 +# %{_datadir}/%{name}/configuration/org.eclipse.osgi/bundles/%{swt_bundle_id} is +# in libswt3-gtk2.install %{_libdir}/%{name}/libswt-*.so %{_libdir}/libswt-*.so %{_javadir}/swt-gtk*.jar @@ -1167,6 +1178,9 @@ fi %{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_3.1.0 %changelog +* Tue Jun 21 2005 Andrew Overholt 3.1.0_fc-0.RC3.2 +- Use SWT bundle ID for SWT %files list (determine in %%install) . + * Mon Jun 20 2005 Andrew Overholt 3.1.0_fc-0.RC3.1 - Import 3.1RC3. - Use FileInitializer (e.o#90535) - this should eliminate .sos in ~/.eclipse.