diff --git a/eclipse.spec b/eclipse.spec index f159d6d..ff8307e 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: 4 +Release: 5 License: CPL Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/ @@ -583,6 +583,13 @@ for j in `find $RPM_BUILD_ROOT%{_datadir}/%{name} -name \*.jar`; do $RPM_BUILD_ROOT%{_datadir}/%{name}/eclipsecompiledjars.list done +# Remove resources.jar +rm $RPM_BUILD_ROOT%{_libdir}/%{name}/resources.jar.so +cat $RPM_BUILD_ROOT%{_datadir}/%{name}/eclipsecompiledjars.list | \ + sed "/\/resources.jar$/d" > eclipsecompiledjars.list.1 +mv eclipsecompiledjars.list.1 \ + $RPM_BUILD_ROOT%{_datadir}/%{name}/eclipsecompiledjars.list + # FIXME until libgcj contains gnujaxp (libgcj PR 19301) gcj4 -fPIC -fjni -findirect-dispatch -shared -Wl,-Bsymbolic \ -o $RPM_BUILD_ROOT%{_libdir}/%{name}/xml-commons-apis-1.0.jar.so \ @@ -778,6 +785,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Jan 24 2005 Andrew Overholt 1:3.0.1_fc-5 +- refine resources.jar.so workaround + * Mon Jan 24 2005 Andrew Overholt 1:3.0.1_fc-4 - add necessary gcj4 compilation option - build on x86_64