diff --git a/eclipse.spec b/eclipse.spec index da140a5..22e244e 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -1,5 +1,4 @@ # TODO: -# - update icu4j and jasper to use %%{_libdir}/eclipse and not %%{_datadir}/eclipse after we build 3.4 # - update ecj-rpmdebuginfo patch # - look at startup script and launcher patches # - get Ganymede update site pre-configured @@ -23,7 +22,7 @@ Epoch: 1 Summary: An open, extensible IDE Name: eclipse Version: %{eclipse_majmin}.%{eclipse_micro} -Release: 22%{?dist} +Release: 23%{?dist} License: EPL Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/ @@ -168,7 +167,7 @@ BuildRequires: mesa-libGL-devel BuildRequires: mesa-libGLU-devel BuildRequires: cairo >= 1.0 BuildRequires: unzip -BuildRequires: icu4j-eclipse >= 3.8.1 +BuildRequires: icu4j-eclipse >= 3.8.1-3 BuildRequires: tomcat5-jasper-eclipse >= 5.5.26-1.5 BuildRequires: desktop-file-utils BuildRequires: java-devel >= 1.6.0 @@ -232,7 +231,7 @@ Requires: %{name}-swt = %{epoch}:%{version}-%{release} # FIXME: investigate. Can we just add a %{arch} to the above? ## This file-level requirement is for the bi-arch multilib case #Requires: %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_%{swtver}.jar -Requires: icu4j-eclipse >= 3.8.1 +Requires: icu4j-eclipse >= 3.8.1-3 Requires: java >= 1.6.0 %description rcp @@ -357,6 +356,7 @@ sed --in-place "s:/usr/share/eclipse:%{_libdir}/%{name}:" templates/package-buil popd pushd features/org.eclipse.platform +# FIXME: fixed in 3.4.1 # Move this file around due a bug in the metadata generator/parser that # can't work with the compiler exclude # https://bugs.eclipse.org/bugs/show_bug.cgi?id=238240 @@ -565,7 +565,7 @@ ln -s %{_javadir}/jsch.jar plugins/com.jcraft.jsch_$JSCHVERSION # link to the icu4j stuff ICUVERSION=$(ls plugins | grep com.ibm.icu_ | sed 's/com.ibm.icu_//') rm plugins/com.ibm.icu_*.jar -ln -s %{_datadir}/eclipse/plugins/com.ibm.icu_*.jar plugins/com.ibm.icu_$ICUVERSION +ln -s %{_libdir}/eclipse/plugins/com.ibm.icu_*.jar plugins/com.ibm.icu_$ICUVERSION # link to lucene LUCENEVERSION=$(ls plugins | grep org.apache.lucene_ | \ @@ -1210,7 +1210,6 @@ ln -s %{_javadir}/jsch.jar plugins/com.jcraft.jsch_$JSCHVERSION # link to the icu4j stuff ICUVERSION=$(ls plugins | grep com.ibm.icu_ | sed 's/com.ibm.icu_//') rm plugins/com.ibm.icu_*.jar -ln -s %{_datadir}/eclipse/plugins/com.ibm.icu_*.jar plugins/com.ibm.icu_$ICUVERSION # link to lucene LUCENEVERSION=$(ls plugins | grep org.apache.lucene_ | \ @@ -1517,6 +1516,9 @@ fi %{_libdir}/%{name}/configuration/org.eclipse.equinox.source %changelog +* Tue Sep 02 2008 Andrew Overholt 3.4.0-23 +- Use icu4j in its new place. + * Wed Aug 27 2008 Andrew Overholt 3.4.0-22 - Add test framework - Remove two duplicate lines in eclipse-mv-Platform.sh